[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r21079: {projects} Update some gettot stuff. (in projects/gettor/i18n: af ar bg bms bo ca cs da de el en es eu fa fi fr fur gl gu he hi hr hu id is it ja ka km ko ku mt nb nl pa pl pt pt_BR ro ru sl sq sv sw th tr uk vi zh_CN zh_HK zh_TW)
Author: pootle
Date: 2009-11-30 21:53:41 -0500 (Mon, 30 Nov 2009)
New Revision: 21079
Modified:
projects/gettor/i18n/af/gettor.po
projects/gettor/i18n/ar/gettor.po
projects/gettor/i18n/bg/gettor.po
projects/gettor/i18n/bms/gettor.po
projects/gettor/i18n/bo/gettor.po
projects/gettor/i18n/ca/gettor.po
projects/gettor/i18n/cs/gettor.po
projects/gettor/i18n/da/gettor.po
projects/gettor/i18n/de/gettor.po
projects/gettor/i18n/el/gettor.po
projects/gettor/i18n/en/gettor.po
projects/gettor/i18n/es/gettor.po
projects/gettor/i18n/eu/gettor.po
projects/gettor/i18n/fa/gettor.po
projects/gettor/i18n/fi/gettor.po
projects/gettor/i18n/fr/gettor.po
projects/gettor/i18n/fur/gettor.po
projects/gettor/i18n/gl/gettor.po
projects/gettor/i18n/gu/gettor.po
projects/gettor/i18n/he/gettor.po
projects/gettor/i18n/hi/gettor.po
projects/gettor/i18n/hr/gettor.po
projects/gettor/i18n/hu/gettor.po
projects/gettor/i18n/id/gettor.po
projects/gettor/i18n/is/gettor.po
projects/gettor/i18n/it/gettor.po
projects/gettor/i18n/ja/gettor.po
projects/gettor/i18n/ka/gettor.po
projects/gettor/i18n/km/gettor.po
projects/gettor/i18n/ko/gettor.po
projects/gettor/i18n/ku/gettor.po
projects/gettor/i18n/mt/gettor.po
projects/gettor/i18n/nb/gettor.po
projects/gettor/i18n/nl/gettor.po
projects/gettor/i18n/pa/gettor.po
projects/gettor/i18n/pl/gettor.po
projects/gettor/i18n/pt/gettor.po
projects/gettor/i18n/pt_BR/gettor.po
projects/gettor/i18n/ro/gettor.po
projects/gettor/i18n/ru/gettor.po
projects/gettor/i18n/sl/gettor.po
projects/gettor/i18n/sq/gettor.po
projects/gettor/i18n/sv/gettor.po
projects/gettor/i18n/sw/gettor.po
projects/gettor/i18n/th/gettor.po
projects/gettor/i18n/tr/gettor.po
projects/gettor/i18n/uk/gettor.po
projects/gettor/i18n/vi/gettor.po
projects/gettor/i18n/zh_CN/gettor.po
projects/gettor/i18n/zh_HK/gettor.po
projects/gettor/i18n/zh_TW/gettor.po
Log:
Update some gettot stuff.
Modified: projects/gettor/i18n/af/gettor.po
===================================================================
--- projects/gettor/i18n/af/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/af/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/ar/gettor.po
===================================================================
--- projects/gettor/i18n/ar/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/ar/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/bg/gettor.po
===================================================================
--- projects/gettor/i18n/bg/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/bg/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/bms/gettor.po
===================================================================
--- projects/gettor/i18n/bms/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/bms/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/bo/gettor.po
===================================================================
--- projects/gettor/i18n/bo/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/bo/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/ca/gettor.po
===================================================================
--- projects/gettor/i18n/ca/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/ca/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/cs/gettor.po
===================================================================
--- projects/gettor/i18n/cs/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/cs/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/da/gettor.po
===================================================================
--- projects/gettor/i18n/da/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/da/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/de/gettor.po
===================================================================
--- projects/gettor/i18n/de/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/de/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/el/gettor.po
===================================================================
--- projects/gettor/i18n/el/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/el/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/en/gettor.po
===================================================================
--- projects/gettor/i18n/en/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/en/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/es/gettor.po
===================================================================
--- projects/gettor/i18n/es/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/es/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/eu/gettor.po
===================================================================
--- projects/gettor/i18n/eu/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/eu/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/fa/gettor.po
===================================================================
--- projects/gettor/i18n/fa/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/fa/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/fi/gettor.po
===================================================================
--- projects/gettor/i18n/fi/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/fi/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -2,260 +2,24 @@
# Copyright (C) 2009
# This file is distributed under the same license as the GetTor package.
# Jacob Appelbaum <jacob@xxxxxxxxxxxxx>, 2009
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
+"PO-Revision-Date: 2009-08-22 17:43+0000\n"
+"Last-Translator: Irma <monochrome.technicolor@xxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"X-Generator: Pootle 1.1.0\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +40,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +221,51 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
+#~ msgid "Won't send myself emails."
+#~ msgstr "En lähetä itselleni sähköpostia."
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
+#, python-format
+#~ msgid "Signature is: %s"
+#~ msgstr "Allekirjoitus on: %s"
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
+#, python-format
+#~ msgid "Package: %s selected."
+#~ msgstr "Paketti: %s valittu."
Modified: projects/gettor/i18n/fr/gettor.po
===================================================================
--- projects/gettor/i18n/fr/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/fr/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: 2009-08-17 20:42+0000\n"
"Last-Translator: Mfr <mfr@xxxxxxxxxxxxxxx>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -15,246 +15,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Pootle 1.1.0\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr "Désolé, %s n'est pas un répertoire."
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr "Echec de l'installation de cron."
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr "Installation de cron effectuée."
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -275,52 +40,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -357,50 +221,50 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
+#, python-format
+#~ msgid "Sorry, %s is not a directory."
+#~ msgstr "Désolé, %s n'est pas un répertoire."
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
+#~ msgid "Installing cron failed"
+#~ msgstr "Echec de l'installation de cron."
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
+#~ msgid "Installing cron done."
+#~ msgstr "Installation de cron effectuée."
Modified: projects/gettor/i18n/fur/gettor.po
===================================================================
--- projects/gettor/i18n/fur/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/fur/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/gl/gettor.po
===================================================================
--- projects/gettor/i18n/gl/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/gl/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/gu/gettor.po
===================================================================
--- projects/gettor/i18n/gu/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/gu/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/he/gettor.po
===================================================================
--- projects/gettor/i18n/he/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/he/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/hi/gettor.po
===================================================================
--- projects/gettor/i18n/hi/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/hi/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/hr/gettor.po
===================================================================
--- projects/gettor/i18n/hr/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/hr/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/hu/gettor.po
===================================================================
--- projects/gettor/i18n/hu/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/hu/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/id/gettor.po
===================================================================
--- projects/gettor/i18n/id/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/id/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/is/gettor.po
===================================================================
--- projects/gettor/i18n/is/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/is/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/it/gettor.po
===================================================================
--- projects/gettor/i18n/it/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/it/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/ja/gettor.po
===================================================================
--- projects/gettor/i18n/ja/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/ja/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/ka/gettor.po
===================================================================
--- projects/gettor/i18n/ka/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/ka/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/km/gettor.po
===================================================================
--- projects/gettor/i18n/km/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/km/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/ko/gettor.po
===================================================================
--- projects/gettor/i18n/ko/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/ko/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/ku/gettor.po
===================================================================
--- projects/gettor/i18n/ku/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/ku/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/mt/gettor.po
===================================================================
--- projects/gettor/i18n/mt/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/mt/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/nb/gettor.po
===================================================================
--- projects/gettor/i18n/nb/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/nb/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/nl/gettor.po
===================================================================
--- projects/gettor/i18n/nl/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/nl/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/pa/gettor.po
===================================================================
--- projects/gettor/i18n/pa/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/pa/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/pl/gettor.po
===================================================================
--- projects/gettor/i18n/pl/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/pl/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/pt/gettor.po
===================================================================
--- projects/gettor/i18n/pt/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/pt/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/pt_BR/gettor.po
===================================================================
--- projects/gettor/i18n/pt_BR/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/pt_BR/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/ro/gettor.po
===================================================================
--- projects/gettor/i18n/ro/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/ro/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/ru/gettor.po
===================================================================
--- projects/gettor/i18n/ru/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/ru/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/sl/gettor.po
===================================================================
--- projects/gettor/i18n/sl/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/sl/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/sq/gettor.po
===================================================================
--- projects/gettor/i18n/sq/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/sq/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/sv/gettor.po
===================================================================
--- projects/gettor/i18n/sv/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/sv/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/sw/gettor.po
===================================================================
--- projects/gettor/i18n/sw/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/sw/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/th/gettor.po
===================================================================
--- projects/gettor/i18n/th/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/th/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/tr/gettor.po
===================================================================
--- projects/gettor/i18n/tr/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/tr/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/uk/gettor.po
===================================================================
--- projects/gettor/i18n/uk/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/uk/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/vi/gettor.po
===================================================================
--- projects/gettor/i18n/vi/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/vi/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/zh_CN/gettor.po
===================================================================
--- projects/gettor/i18n/zh_CN/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/zh_CN/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/zh_HK/gettor.po
===================================================================
--- projects/gettor/i18n/zh_HK/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/zh_HK/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""
Modified: projects/gettor/i18n/zh_TW/gettor.po
===================================================================
--- projects/gettor/i18n/zh_TW/gettor.po 2009-12-01 02:53:39 UTC (rev 21078)
+++ projects/gettor/i18n/zh_TW/gettor.po 2009-12-01 02:53:41 UTC (rev 21079)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 14:55-0700\n"
+"POT-Creation-Date: 2009-12-01 00:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -16,246 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 1.1.1\n"
-#: GetTor.py:167
-msgid "Sorry, your package list is unusable."
-msgstr ""
-
-#: GetTor.py:168
-msgid "Try running with --fetch-packages --prep-packages."
-msgstr ""
-
-#: GetTor.py:175
-msgid "No raw message. Something went wrong."
-msgstr ""
-
-#: GetTor.py:179
-msgid "No parsed message. Dropping message."
-msgstr ""
-
-#: GetTor.py:183
-msgid "No help dispatched. Invalid reply address for user."
-msgstr ""
-
-#: GetTor.py:194
-msgid "Won't send myself emails."
-msgstr ""
-
-#: GetTor.py:200
-#, python-format
-msgid "Signature is: %s"
-msgstr ""
-
-#: GetTor.py:209
-msgid "Unsigned messaged to gettor by blacklisted user dropped."
-msgstr ""
-
-#: GetTor.py:215
-msgid "Unsigned messaged to gettor. We issued some help."
-msgstr ""
-
-#: GetTor.py:218
-msgid "Good message to gettor."
-msgstr ""
-
-#: GetTor.py:221
-#, python-format
-msgid "Package: %s selected."
-msgstr ""
-
-#: GetTor.py:222
-#, python-format
-msgid "Sending delay alert email: %s"
-msgstr ""
-
-#: GetTor.py:224
+#: lib/gettor/constants.py:17
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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"
-" 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@xxxxxxxxxxxxxx\n"
-"\n"
-" "
-msgstr ""
-
-#: GetTor.py:242
-msgid "Failed to send delay alert"
-msgstr ""
-
-#: GetTor.py:245
-#, python-format
-msgid "Failed at attempt to send package: %s"
-msgstr ""
-
-#: GetTor.py:248
-#, python-format
-msgid "Package sent: %s"
-msgstr ""
-
-#: GetTor.py:251
-msgid "We issued some help about proper email formatting."
-msgstr ""
-
-#: GetTor.py:285
-#, python-format
-msgid "Sorry, %s is not a directory."
-msgstr ""
-
-#: GetTor.py:290
-msgid "Error initiating package list."
-msgstr ""
-
-#: GetTor.py:296
-#, python-format
-msgid "White/Black list error: %s"
-msgstr ""
-
-#: GetTor.py:301
-msgid "Syncing Tor packages failed."
-msgstr ""
-
-#: GetTor.py:304
-msgid "Syncing Tor packages done."
-msgstr ""
-
-#: GetTor.py:308
-msgid "Building packages failed."
-msgstr ""
-
-#: GetTor.py:311
-msgid "Building packages done."
-msgstr ""
-
-#: GetTor.py:315
-msgid "Tests failed."
-msgstr ""
-
-#: GetTor.py:318
-msgid "Tests passed."
-msgstr ""
-
-#: GetTor.py:322
-msgid "Installing cron failed"
-msgstr ""
-
-#: GetTor.py:325
-msgid "Installing cron done."
-msgstr ""
-
-#: GetTor.py:329
-msgid "Creating whitelist entry failed."
-msgstr ""
-
-#: GetTor.py:332
-msgid "Creating whitelist entry ok."
-msgstr ""
-
-#: GetTor.py:336
-msgid "Creating blacklist entry failed."
-msgstr ""
-
-#: GetTor.py:339
-msgid "Creating blacklist entry ok."
-msgstr ""
-
-#: GetTor.py:343
-msgid "Present in whitelist."
-msgstr ""
-
-#: GetTor.py:346
-msgid "Present in blacklist."
-msgstr ""
-
-#: GetTor.py:349
-msgid "Address neither in blacklist or whitelist."
-msgstr ""
-
-#: GetTor.py:353
-msgid "Deleting whitelist failed."
-msgstr ""
-
-#: GetTor.py:356
-msgid "Deleting whitelist done."
-msgstr ""
-
-#: GetTor.py:360
-msgid "Deleting blacklist failed."
-msgstr ""
-
-#: GetTor.py:363
-msgid "Deleting blacklist done."
-msgstr ""
-
-#: GetTor.py:373
-msgid "Processing mail failed."
-msgstr ""
-
-#: gettor/blacklist.py:45
-#, python-format
-msgid "Creating list entry %s failed."
-msgstr ""
-
-#: gettor/blacklist.py:58
-#, python-format
-msgid "Could not unlink entry %s"
-msgstr ""
-
-#: gettor/blacklist.py:61
-#, python-format
-msgid "Requested removal of non-existing entry %s. Abord."
-msgstr ""
-
-#: gettor/blacklist.py:73
-#, python-format
-msgid "Could not remove %s."
-msgstr ""
-
-#: gettor/packages.py:67
-#, python-format
-msgid "Failed to build package list: %s"
-msgstr ""
-
-#: gettor/packages.py:74
-#, python-format
-msgid "Warning: %s not accessable. Removing from list."
-msgstr ""
-
-#: gettor/packages.py:96
-msgid "Failed at building packages"
-msgstr ""
-
-#: gettor/requests.py:62
-#, python-format
-msgid "User requested package %s"
-msgstr ""
-
-#: gettor/requests.py:70
-#, python-format
-msgid "User requested locale %s"
-msgstr ""
-
-#: gettor/requests.py:76
-#, python-format
-msgid "Requested language %s not supported. Falling back to %s"
-msgstr ""
-
-#: gettor/responses.py:48
-msgid ""
-"\n"
-" Hello! This is the \"gettor\" robot.\n"
-"\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"
@@ -276,52 +41,151 @@
" "
msgstr ""
-#: gettor/responses.py:73
-msgid "Could not send help message to user"
-msgstr ""
-
-#: gettor/responses.py:89
+#: lib/gettor/constants.py:39
msgid ""
"\n"
-" Hello, This is the \"gettor\" robot.\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-universal-bundle\n"
-" panther-bundle\n"
+" macosx-i386-bundle\n"
+" macosx-ppc-bundle\n"
" tor-im-browser-bundle\n"
" source-bundle\n"
"\n"
" Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
" a single package name anywhere in the body of your email.\n"
"\n"
-" Please note that currently we can't process HTML emails or base64\n"
-" emails. You will need to send plain text.\n"
+" OBTAINING LOCALIZED VERSIONS OF TOR\n"
+" ===================================\n"
"\n"
+" Please note that GetTor can send out localized versions of Tor.\n"
+"\n"
+" Obtaining localized Tor via 'plus' addresses:\n"
+" --------------------------------------------\n"
+"\n"
+" There are two ways how to receive localized versions of Tor. The \n"
+" first and easiest is to send us email to a 'plus' address like so:\n"
+"\n"
+" gettor+zh_CN@xxxxxxxxxxxxxx\n"
+"\n"
+" This will for exmaple give you the requested package in a localized\n"
+" version for chinese. Check below for a list of supported language \n"
+" codes.\n"
+"\n"
+" Obtaining localized Tor via 'Lang' code:\n"
+" ---------------------------------------\n"
+"\n"
+" The other way to receive a localized Tor package is the following:\n"
+"\n"
+" In your mail to us, please add a line containing \"Lang:\" followed by\n"
+" the language abbreviation like so:\n"
+"\n"
+" Lang: language\n"
+"\n"
+" For example if you want the tor-browser-bundle for in chinese, write\n"
+" us an email with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: zh_CN\n"
+"\n"
+" Or, if you want the tor-browser-bundle in farsi, write us an email\n"
+" with the following text:\n"
+"\n"
+" tor-browser-bundle\n"
+" Lang: fa\n"
+"\n"
+" List of supported locales:\n"
+" -------------------------\n"
+"\n"
+" Here is a list of all available languages:\n"
+"\n"
+" ar: Arabic\n"
+" de: German\n"
+" en: English\n"
+" es: Spanish\n"
+" fa: Farsi (Iran)\n"
+" fr: French\n"
+" it: Italian\n"
+" nl: Dutch\n"
+" pl: Polish\n"
+" ru: Russian\n"
+" zh_CN: Chinese\n"
+"\n"
+" If you select no language, you will receive the english version.\n"
+"\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@xxxxxxxxxxxxxx\n"
"\n"
" "
msgstr ""
-#: gettor/responses.py:116
-msgid "Could not send package help message to user"
+#: lib/gettor/constants.py:120
+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"
+" 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@xxxxxxx>\"\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:128
-msgid "Could not send generic help message to user"
-msgstr ""
-
-#: gettor/responses.py:136
+#: lib/gettor/constants.py:159
msgid ""
"\n"
-" Hello! This is the \"gettor\" robot.\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"
+" 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"
@@ -358,50 +222,40 @@
" "
msgstr ""
-#: gettor/responses.py:178
-msgid "Could not send package to user"
+#: lib/gettor/constants.py:207
+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"
+" 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@xxxxxxxxxxxxxx\n"
+"\n"
+" "
msgstr ""
-#: gettor/responses.py:191
-msgid "Re: Your \"gettor\" request"
+#: lib/gettor/constants.py:224
+msgid ""
+"\n"
+" Hello, This is the \"GetTor\" robot.\n"
+"\n"
+" Thank you for your request.\n"
+"\n"
+" Unfortunatly 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 ""
-
-#: gettor/responses.py:218
-msgid "SMTP authentication error"
-msgstr ""
-
-#: gettor/responses.py:221
-msgid "SMTP HELO error"
-msgstr ""
-
-#: gettor/responses.py:224
-msgid "SMTP connection error"
-msgstr ""
-
-#: gettor/responses.py:227
-msgid "SMTP data error"
-msgstr ""
-
-#: gettor/responses.py:230
-msgid "SMTP refused to send to recipients"
-msgstr ""
-
-#: gettor/responses.py:233
-msgid "SMTP sender address refused"
-msgstr ""
-
-#: gettor/responses.py:236
-msgid "SMTP response exception received"
-msgstr ""
-
-#: gettor/responses.py:239
-msgid "SMTP server disconnect exception received"
-msgstr ""
-
-#: gettor/responses.py:242
-msgid "General SMTP error caught"
-msgstr ""
-
-#: gettor/responses.py:245
-msgid "Unknown SMTP error while trying to send via local MTA"
-msgstr ""