[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [gettor/master] Updated all .po files and did some other minor changes to the locale code

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [gettor/master] Updated all .po files and did some other minor changes to the locale code
From: kaner@xxxxxxxxxxxxxx
Date: Thu, 24 Feb 2011 19:12:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 24 Feb 2011 14:16:49 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: code repository commits <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Christian Fromme <kaner@xxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx

commit 76b97197002398ac776963d03670bbc5b1639382
Author: Christian Fromme <kaner@xxxxxxxxxx>
Date:   Thu Feb 24 11:30:48 2011 +0100

    Updated all .po files and did some other minor changes to the locale code
---
 README.locale-spec-draft  |    3 +-
 i18n/af/gettor.po         |  405 +++++++--------------
 i18n/ak/gettor.po         |  405 +++++++--------------
 i18n/am/gettor.po         |  405 +++++++--------------
 i18n/ar/gettor.po         |  543 ++++++++++++----------------
 i18n/arn/gettor.po        |  405 +++++++--------------
 i18n/ast/gettor.po        |  405 +++++++--------------
 i18n/az/gettor.po         |  509 +++++++++++---------------
 i18n/be/gettor.po         |  405 +++++++--------------
 i18n/bg/gettor.po         |  405 +++++++--------------
 i18n/bms/gettor.po        |  615 +++++++++++++------------------
 i18n/bn/gettor.po         |  531 +++++++++++----------------
 i18n/bn_IN/gettor.po      |  405 +++++++--------------
 i18n/bo/gettor.po         |  405 +++++++--------------
 i18n/br/gettor.po         |  405 +++++++--------------
 i18n/bs/gettor.po         |  405 +++++++--------------
 i18n/ca/gettor.po         |  503 +++++++++++---------------
 i18n/cs/gettor.po         |  405 +++++++--------------
 i18n/csb/gettor.po        |  405 +++++++--------------
 i18n/cy/gettor.po         |  405 +++++++--------------
 i18n/da/gettor.po         |  504 +++++++++++---------------
 i18n/de/gettor.po         |  898 +++++++++------------------------------------
 i18n/dz/gettor.po         |  405 +++++++--------------
 i18n/el/gettor.po         |  405 +++++++--------------
 i18n/en/gettor.po         |  405 +++++++--------------
 i18n/eo/gettor.po         |  405 +++++++--------------
 i18n/es/gettor.po         |  548 ++++++++++++----------------
 i18n/et/gettor.po         |  406 +++++++--------------
 i18n/eu/gettor.po         |  405 +++++++--------------
 i18n/fa/gettor.po         |  779 +++++++++++++++++----------------------
 i18n/fi/gettor.po         |  606 +++++++++++++------------------
 i18n/fil/gettor.po        |  405 +++++++--------------
 i18n/fo/gettor.po         |  405 +++++++--------------
 i18n/fr/gettor.po         |  576 +++++++++++++----------------
 i18n/fur/gettor.po        |  405 +++++++--------------
 i18n/fy/gettor.po         |  405 +++++++--------------
 i18n/ga/gettor.po         |  405 +++++++--------------
 i18n/gl/gettor.po         |  405 +++++++--------------
 i18n/gu/gettor.po         |  405 +++++++--------------
 i18n/gun/gettor.po        |  405 +++++++--------------
 i18n/ha/gettor.po         |  405 +++++++--------------
 i18n/he/gettor.po         |  405 +++++++--------------
 i18n/hi/gettor.po         |  405 +++++++--------------
 i18n/hr/gettor.po         |  405 +++++++--------------
 i18n/ht/gettor.po         |  405 +++++++--------------
 i18n/hu/gettor.po         |  405 +++++++--------------
 i18n/hy/gettor.po         |  405 +++++++--------------
 i18n/id/gettor.po         |  527 +++++++++++---------------
 i18n/is/gettor.po         |  481 +++++++++---------------
 i18n/it/gettor.po         |  425 ++++++++--------------
 i18n/ja/gettor.po         |  446 ++++++++---------------
 i18n/jv/gettor.po         |  405 +++++++--------------
 i18n/ka/gettor.po         |  405 +++++++--------------
 i18n/km/gettor.po         |  405 +++++++--------------
 i18n/kn/gettor.po         |  405 +++++++--------------
 i18n/ko/gettor.po         |  412 +++++++--------------
 i18n/ku/gettor.po         |  405 +++++++--------------
 i18n/kw/gettor.po         |  405 +++++++--------------
 i18n/ky/gettor.po         |  405 +++++++--------------
 i18n/lb/gettor.po         |  405 +++++++--------------
 i18n/lg/gettor.po         |  405 +++++++--------------
 i18n/ln/gettor.po         |  405 +++++++--------------
 i18n/lo/gettor.po         |  405 +++++++--------------
 i18n/lt/gettor.po         |  405 +++++++--------------
 i18n/lv/gettor.po         |  405 +++++++--------------
 i18n/mg/gettor.po         |  405 +++++++--------------
 i18n/mi/gettor.po         |  405 +++++++--------------
 i18n/mk/gettor.po         |  405 +++++++--------------
 i18n/ml/gettor.po         |  405 +++++++--------------
 i18n/mn/gettor.po         |  405 +++++++--------------
 i18n/mr/gettor.po         |  405 +++++++--------------
 i18n/ms/gettor.po         |  405 +++++++--------------
 i18n/mt/gettor.po         |  405 +++++++--------------
 i18n/nah/gettor.po        |  405 +++++++--------------
 i18n/nap/gettor.po        |  405 +++++++--------------
 i18n/nb/gettor.po         |  417 +++++++--------------
 i18n/ne/gettor.po         |  405 +++++++--------------
 i18n/nl/gettor.po         |  508 +++++++++++---------------
 i18n/nn/gettor.po         |  405 +++++++--------------
 i18n/nso/gettor.po        |  405 +++++++--------------
 i18n/oc/gettor.po         |  405 +++++++--------------
 i18n/or/gettor.po         |  405 +++++++--------------
 i18n/pa/gettor.po         |  405 +++++++--------------
 i18n/pap/gettor.po        |  405 +++++++--------------
 i18n/pl/gettor.po         |  494 ++++++++++---------------
 i18n/pms/gettor.po        |  405 +++++++--------------
 i18n/ps/gettor.po         |  405 +++++++--------------
 i18n/pt/gettor.po         |  538 ++++++++++------------------
 i18n/pt_BR/gettor.po      |  419 +++++++--------------
 i18n/ro/gettor.po         |  405 +++++++--------------
 i18n/ru/gettor.po         |  582 +++++++++++++-----------------
 i18n/sco/gettor.po        |  405 +++++++--------------
 i18n/sk/gettor.po         |  405 +++++++--------------
 i18n/sl/gettor.po         |  405 +++++++--------------
 i18n/so/gettor.po         |  405 +++++++--------------
 i18n/son/gettor.po        |  405 +++++++--------------
 i18n/sq/gettor.po         |  405 +++++++--------------
 i18n/sr/gettor.po         |  496 ++++++++++---------------
 i18n/st/gettor.po         |  405 +++++++--------------
 i18n/su/gettor.po         |  405 +++++++--------------
 i18n/sv/gettor.po         |  405 +++++++--------------
 i18n/sw/gettor.po         |  405 +++++++--------------
 i18n/ta/gettor.po         |  405 +++++++--------------
 i18n/te/gettor.po         |  405 +++++++--------------
 i18n/templates/gettor.pot |  405 +++++++--------------
 i18n/tg/gettor.po         |  405 +++++++--------------
 i18n/th/gettor.po         |  405 +++++++--------------
 i18n/ti/gettor.po         |  405 +++++++--------------
 i18n/tk/gettor.po         |  405 +++++++--------------
 i18n/tr/gettor.po         |  457 ++++++++---------------
 i18n/uk/gettor.po         |  433 ++++++++---------------
 i18n/ur/gettor.po         |  626 +++++++++++++-------------------
 i18n/ve/gettor.po         |  405 +++++++--------------
 i18n/vi/gettor.po         |  522 +++++++++-----------------
 i18n/wa/gettor.po         |  405 +++++++--------------
 i18n/wo/gettor.po         |  405 +++++++--------------
 i18n/zh_CN/gettor.po      |  544 ++++++++++++----------------
 i18n/zh_HK/gettor.po      |  405 +++++++--------------
 i18n/zh_TW/gettor.po      |  405 +++++++--------------
 i18n/zu/gettor.po         |  405 +++++++--------------
 lib/gettor/i18n.py        |   15 +-
 lib/gettor/responses.py   |    1 -
 setup.py                  |    2 +-
 123 files changed, 17199 insertions(+), 34617 deletions(-)

diff --git a/README.locale-spec-draft b/README.locale-spec-draft
index b754f98..c2243b1 100644
--- a/README.locale-spec-draft
+++ b/README.locale-spec-draft
@@ -35,7 +35,8 @@ GENERATING .po/.pot FILES
 
 In the top level directory of the gettor source, run the following command:
 
-    xgettext lib/gettor/constants.py -d gettor -o po/templates/gettor.pot
+    xgettext lib/gettor/i18n.py -dgettor --from-code=utf-8 -o i18n/templates/gettor.pot 
+    for i in i18n/*/gettor.po; do msgmerge -U $i i18n/templates/gettor.pot ; done
 
 Commit your pot file. Then log into the pootle server, commit any
 outstanding changes in ~/gettor/, and do an svn update. Then log into the
diff --git a/i18n/af/gettor.po b/i18n/af/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/af/gettor.po
+++ b/i18n/af/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ak/gettor.po b/i18n/ak/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ak/gettor.po
+++ b/i18n/ak/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/am/gettor.po b/i18n/am/gettor.po
index e7e6736..a711308 100644
--- a/i18n/am/gettor.po
+++ b/i18n/am/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ar/gettor.po b/i18n/ar/gettor.po
index 7be9ce3..6b4217d 100644
--- a/i18n/ar/gettor.po
+++ b/i18n/ar/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-05-03 14:52-0600\n"
 "Last-Translator: Anas Qtiesh <anasqtiesh@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "    Ù?Ø±ØØ¨Ø§Ù?Ø? Ù?Ø°Ø§ Ø±Ù?Ø¨Ù?Øª \"Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? ØªÙ?Ø±\".\n"
@@ -30,14 +29,12 @@ msgstr ""
 "    Ø´Ù?Ø±Ø§Ù? Ù?Ø·Ù?Ø¨Ù?.\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "    Ù?Ù?Ø£Ø³Ù?Ø? Ù?Ù? Ù?Ø³ØªØ·Ù?Ø¹ Ø§Ù?Ø¥Ø¬Ø§Ø¨Ø© Ø¹Ù?Ù?Ù? Ø¹Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ø¹Ù?Ù?Ø§Ù?. Ù?Ø¬Ø¨ Ø£Ù? ØªÙ?Ø´Ø¦\n"
@@ -46,31 +43,27 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
-"    Ù?ØÙ? Ù?Ø¹Ø§Ù?Ø¬ Ø§Ù?Ø·Ù?Ø¨Ø§Øª Ø§Ù?ØªÙ? ØªØ£ØªÙ? Ù?Ù? Ø®Ø¯Ù?Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªÙ? ØªØ¯Ø¹Ù? \"KDIM\" "
-"Ù?Ù?Ø·Ø?\n"
+"    Ù?ØÙ? Ù?Ø¹Ø§Ù?Ø¬ Ø§Ù?Ø·Ù?Ø¨Ø§Øª Ø§Ù?ØªÙ? ØªØ£ØªÙ? Ù?Ù? Ø®Ø¯Ù?Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªÙ? ØªØ¯Ø¹Ù? \"KDIM"
+"\" Ù?Ù?Ø·Ø?\n"
 "    Ù?Ù?Ù? Ù?Ù?Ø²Ø© Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? ØªØ³Ù?Ø Ù?Ù?Ø§ Ø¨Ø§Ù?ØªØÙ?Ù? Ù?Ù? Ø£Ù? Ø§Ù?Ø¹Ù?Ù?Ø§Ù? Ù?Ù? Ø³Ø·Ø±\n"
 "    \"Ø§Ù?Ù?Ø±Ø³Ù?\" Ù?Ù? Ø¨Ø§Ù?Ù?Ø¹Ù? Ù?Ù? Ø£Ø±Ø³Ù? Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø©.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "    (Ù?Ø¹ØªØ°Ø± Ù?Ù?Ù? Ø¥Ù? Ù?Ù?Øª Ù?Ù? ØªØ·Ù?Ø¨ Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø©. Ø¨Ù?Ø§ Ø£Ù?Ù? Ø£ØªØªÙ?Ø§ Ø±Ø³Ø§Ù?ØªÙ? Ù?Ù?\n"
@@ -79,13 +72,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "    Ù?Ø±Ø¬Ù? Ø£Ù? ØªÙ?Ø§ØØ¸ Ø£Ù?Ù?Ø§ ØØ§Ù?Ù?Ø§Ù? ØºÙ?Ø± Ù?Ø§Ø¯Ø±Ù?Ù? Ø¹Ù?Ù? Ù?Ø¹Ø§Ù?Ø¬Ø© Ø§Ù?Ø±Ø³Ø§Ø¦Ù? Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© "
@@ -94,28 +85,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "    Ø¥Ù? Ù?Ø§Ù?Øª Ù?Ø¯Ù?Ù? Ø£Ø³Ø¦Ù?Ø© Ø£Ù? Ù?Ù? ØªÙ?Ù?Ø¹ Ù?ØØ§Ù?Ù?ØªÙ?Ø? Ù?Ø±Ø¬Ù? Ø§Ù?Ø§ØªØµØ§Ù?\n"
-"    Ø¨Ø´Ø®Øµ Ø¨Ø´Ø±Ù? Ø¹Ù?Ù? Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªØ§Ù?Ù?: tor-"
-"assistants@xxxxxxxxxxxxxx\n"
+"    Ø¨Ø´Ø®Øµ Ø¨Ø´Ø±Ù? Ø¹Ù?Ù? Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªØ§Ù?Ù?: tor-assistants@torproject."
+"org\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "    Ø³Ø£Ø±Ø³Ù? Ù?Ù? ØØ²Ù?Ø© ØªÙ?Ø±Ø? Ø¥Ù? Ø£Ø®Ø¨Ø±ØªÙ?Ù? Ø£Ù? Ù?Ø§ØØ¯Ø© ØªØ±Ù?Ø¯.\n"
@@ -123,13 +110,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    Ù?Ø±Ø¬Ù? Ø§Ù?Ø±Ø¯ Ø¹Ù?Ù? Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø© (Ø¹Ù?Ù? gettor@xxxxxxxxxxxxxx )Ø? Ù?Ø£Ù? ØªØ®Ø¨Ø±Ù?Ù?\n"
@@ -137,23 +122,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "    Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ù?Ø³Ø® Ù?ØªØ±Ø¬Ù?Ø© Ù?Ù? ØªÙ?Ø±\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "    Ù?ØªØØµÙ? Ø¹Ù?Ù? Ù?Ø³Ø®Ø© ØªÙ?Ø± Ù?ØªØ±Ø¬Ù?Ø© Ø¥Ù?Ù? Ù?ØºØªÙ?Ø? Ù?Ø±Ø¬Ù? Ø£Ù? ØªØØ¯Ø¯\n"
@@ -161,14 +142,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "    Ù?Ù? Ø§Ù?Ù?Ø«Ø§Ù? Ø§Ù?Ø°Ù? Ø³Ø£Ø¹Ø·Ù?Ù?Ø? Ø³ØªØ·Ù?Ø¨ ØØ²Ù?Ø© Ù?ØªØ±Ø¬Ù?Ø© Ø¥Ù?Ù?\n"
@@ -177,31 +156,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "    Ù?Ø§Ø¦Ù?Ø© Ø§Ù?Ù?ØºØ§Øª Ø§Ù?Ù?Ø¯Ø¹Ù?Ù?Ø©:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "    Ù?Ø°Ù? Ù?Ø§Ø¦Ù?Ø© Ø¨Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?ØºØ§Øª Ø§Ù?Ù?ØªÙ?Ù?Ø±Ø©:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -212,9 +186,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:    Ø§Ù?Ø¹Ø±Ø¨Ù?Ø©\n"
@@ -231,36 +203,29 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "    Ø¥Ù? Ù?Ù?Øª Ù?Ù? ØªØ®ØªØ± Ù?ØºØ©Ø? Ù?Ø³Ù?Ù? ØªØØµÙ? Ø¹Ù?Ù? Ø§Ù?Ù?Ø³Ø®Ø© Ø§Ù?Ø¥Ù?Ù?Ù?Ù?Ø²Ù?Ø©.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "    ØØ²Ù? Ø£ØµØºØ± ØØ¬Ù?Ø§Ù?    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "    Ø¥Ù? Ù?Ø§Ù? Ø¹Ø±Ø¶ Ø§Ù?ØØ²Ù?Ø© Ù?Ø¯Ù?Ù? Ù?Ù?Ø®Ù?Ø¶Ø§Ù? Ø£Ù? Ø¥Ø°Ø§ Ù?Ø§Ù? Ù?Ø²Ù?Ø¯ Ø§Ù?Ø®Ø¯Ù?Ø© Ø§Ù?Ø®Ø§Øµ Ø¨Ù? Ù?Ø§ Ù?Ø³Ù?Ø \n"
@@ -270,38 +235,32 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "    Ù?Ù?Ø· Ø£Ø¯Ø®Ù? Ù?Ù?Ù?Ø© 'split' (Ø¨Ù?Ø¹Ù?Ù? ØªÙ?Ø³Ù?Ù?) Ù?Ù? Ø¬Ø³Ù? Ø±Ø³Ø§Ù?ØªÙ? Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© Ù?Ø§Ù?ØªØ§Ù?Ù?:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
-"    Ø¥Ø±Ø³Ø§Ù? Ù?Ø°Ø§ Ø§Ù?Ù?Øµ Ù?Ù? Ø±Ø³Ø§Ù?Ø© Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© Ø¥Ù?Ù? \"Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? ØªÙ?Ø±\" Ø³Ù?ØªØ³Ø¨Ø¨ Ù?Ù? Ø£Ù? Ù?Ø±Ø³Ù? "
-"Ù?Ù? \n"
+"    Ø¥Ø±Ø³Ø§Ù? Ù?Ø°Ø§ Ø§Ù?Ù?Øµ Ù?Ù? Ø±Ø³Ø§Ù?Ø© Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù?Ø© Ø¥Ù?Ù? \"Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? ØªÙ?Ø±\" Ø³Ù?ØªØ³Ø¨Ø¨ Ù?Ù? Ø£Ù? "
+"Ù?Ø±Ø³Ù? Ù?Ù? \n"
 "    ØØ²Ù?Ø© Ù?ØªØµÙ?Ø ØªÙ?Ø± Ù?Ù? Ø¹Ø¯Ø¯ Ù?Ù? Ø§Ù?Ù?Ø±Ù?Ù?Ø§Øª Ø¨ØØ¬Ù? 1.4 Ù?Ù?Ø¬Ø§ Ø¨Ø§Ù?Øª.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "    Ø¨Ø¹Ø¯ Ø£Ù? ØªØªÙ?Ù?Ù? Ø¬Ù?Ù?Ø¹ Ø§Ù?Ø£Ø¬Ø²Ø§Ø¡Ø? Ø³ØªØØªØ§Ø¬ Ø£Ù? ØªØ¹Ù?Ø¯ ØªØ¬Ù?Ù?Ø¹Ù?Ø§ Ù?Ù? \n"
@@ -309,55 +268,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "    Ø§- Ø§ØÙ?Ø¸ Ø¬Ù?Ù?Ø¹ Ø§Ù?Ø£Ø¬Ø²Ø§Ø¡ Ø§Ù?ØªÙ? ØªÙ?Ù?Ù?ØªÙ?Ø§ Ù?Ù? Ù?Ø¬Ù?Ø¯ Ù?Ø§ØØ¯ Ø¹Ù?Ù? Ø¬Ù?Ø§Ø²Ù?.\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"    2- Ù?Ù? Ø¶ØºØ¸ Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ù?ØªÙ?Ù?Ø© Ø¨Ù? \"z.\" Ø¥Ù? Ù?Ù?Øª Ù?Ø¯ ØÙ?Ø¸Øª Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ø±Ù?Ù?Ø§Øª Ù?Ù?\n"
+"    2- Ù?Ù? Ø¶ØºØ¸ Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ù?ØªÙ?Ù?Ø© Ø¨Ù? \"z.\" Ø¥Ù? Ù?Ù?Øª Ù?Ø¯ ØÙ?Ø¸Øª Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ø±Ù?Ù?Ø§Øª "
+"Ù?Ù?\n"
 "        Ù?Ø¬Ù?Ø¯ Ø¬Ø¯Ù?Ø¯ Ù?Ù? Ø§Ù?Ø³Ø§Ø¨Ù?Ø? Ø¨Ø¨Ø³Ø§Ø·Ø© Ù?Ù? Ø¶ØºØ· Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ù?Ø§Øª Ù?Ù? Ø°Ø§Ù? Ø§Ù?Ù?Ø¬Ù?Ø¯.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"    3- Ø£Ø¹Ø¯ ØªØ³Ù?Ù?Ø© Ø§Ù?Ù?Ù?Ù? Ø§Ù?Ù?Ù?ØªÙ?Ù? Ø¨Ù? \"ex_RENAME.\" Ù?Ù?Ù?ØªÙ?Ù? Ø¨Ù? \"exe.\" Ù?\n"
-"        Ø£Ù?Ø¶Ø§Ù? Ø£Ø¹Ø¯ ØªØ³Ù?Ù?Ø© Ø§Ù?Ù?Ù?Ù? Ø§Ù?Ù?Ù?ØªÙ?Ù? Ø¨Ù? \"ex_RENAME.asc.\" Ù?Ù?Ù?ØªÙ?Ù? Ø¨Ù?\n"
-"        \"exe.asc.\"\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "    4- ØªØÙ?Ù? Ù?Ù? Ø£Ù? Ø¬Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ù?Ø§Øª Ø§Ù?Ù?Ù?ØµÙ?Ù?Ø© Ù?Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø© Ø§Ù?ØªÙ? ØªÙ?Ù?Ù?ØªÙ?Ø§ Ù?Ø¹\n"
@@ -365,14 +302,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "    5- Ø§Ù?Ø¢Ù? Ø§Ø³ØªØ®Ø¯Ù? Ø¨Ø±Ù?Ø§Ù?Ø¬Ø§Ù? Ù?Ù?Ù?Ù?Ù? Ù?Ù? Ø¶ØºØ· Ø£Ø±Ø´Ù?Ù?Ø§Øª RAR Ù?ØªØ¹Ø¯Ø¯Ø©. Ø¹Ù?Ù? Ù?Ù?Ù?Ø¯Ù?Ø²\n"
@@ -381,26 +316,21 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "        Ù?Ù?ØªØ ØØ²Ù?Ø© ØªÙ?Ø±Ø? Ø¨Ø¨Ø³Ø§Ø·Ø© Ø§Ø¶ØºØ· Ø¹Ù?Ù? Ù?Ù?Ù? \"exe.\"\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "    6- Ø¨Ø¹Ø¯ Ù?ØªØ Ø§Ù?ØØ²Ù?Ø©Ø? Ù?ØªÙ?Ø¬Ø¨ Ø¹Ù?Ù?Ù? Ø£Ù? ØªØ¬Ø¯ Ù?Ù?Ù?\n"
@@ -409,35 +339,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "    7- Ù?Ø°Ø§ Ù?Ù? Ù?Ø§ Ø§Ù?Ø£Ù?Ø±. Ø´Ù?Ø±Ø§Ù? Ù?Ø§Ø³ØªØ®Ø¯Ø§Ù?Ù? ØªÙ?Ø± Ù?Ø§Ø³ØªÙ?ØªØ¹ Ø¨Ù?!\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"    Ø§Ù?Ø¯Ø¹Ù?\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "    Ù?Ø°Ø§ Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬ Ø§Ù?Ø°Ù? Ø·Ù?Ø¨ØªÙ? Ø¹Ù?Ù? Ø´Ù?Ù? Ù?Ù?Ù? zip. Ù?Ø±Ø¬Ù? Ù?Ù? Ø¶ØºØ·\n"
@@ -445,13 +364,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "    ØªÙ?Ù?Ù?Ø: Ø¥Ù? Ù?Ø§Ù? Ù?Ù?Ø¨Ù?Ù?ØªØ±Ù? Ù?ØÙ?Ù? GnuPG Ù?Ù?ØµØ¨Ø§Ù?Ø? Ø§Ø³ØªØ®Ø¯Ù? Ø£Ø¯Ø§Ø©\n"
@@ -459,37 +376,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"        gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "    Ø§Ù?Ù?Ø®Ø±Ø¬Ø§Øª Ù?Ø¬Ø¨ Ø£Ù? ØªÙ?Ù?Ù? Ù?Ø§Ù?ØªØ§Ù?Ù?:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "    Ø¥Ù? Ù?Ù? ØªÙ?Ù? Ø°Ø§ Ø¯Ø±Ø§Ù?Ø© Ø¨Ø£Ø¯Ù?Ø§Øª Ø³Ø·Ø± Ø§Ù?Ø£Ù?Ø§Ù?Ø±Ø? ØØ§Ù?Ù? Ø§Ù?Ø¨ØØ« Ø¹Ù?\n"
@@ -497,17 +397,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    Ø¥Ù? Ù?Ø§Ù? Ø§ØªØµØ§Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ø§Ù?Ø®Ø§Øµ Ø¨Ù? Ù?ØØ¬Ø¨ Ø§Ù?Ù?ØµÙ?Ù? Ø¥Ù?Ù? Ø´Ø¨Ù?Ø© ØªÙ?Ø±Ø? Ù?Ø¯\n"
@@ -519,15 +417,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "    Ù?Ù?Ù?Ù?Ù? Ø§Ù?ØØµÙ?Ù? Ø¹Ù?Ù? Ø¬Ø³Ø± Ø¨Ø¥Ø±Ø³Ø§Ù? Ø±Ø³Ø§Ù?Ø© Ø¥Ù?Ù?Ø±Ù?Ù?Ù?Ø© ØªØÙ?Ù? \"\n"
@@ -536,14 +430,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "    Ù?Ù? Ø§Ù?Ù?Ù?Ù?Ù? Ø£Ù?Ø¶Ø§Ù? Ø¥ØØ¶Ø§Ø± Ø§Ù?Ø¬Ø³Ù?Ø± Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?ØªØµÙ?Ø Ù?ØªÙ?Ø¬Ù?Ù?Ù? Ø¥Ù?Ù? Ø§Ù?Ø¹Ù?Ù?Ø§Ù?\n"
@@ -551,16 +442,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    Ù?Ù?Ø§ØØ¸Ø© Ù?Ø§Ù?Ø©:\n"
@@ -571,13 +460,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "    Ù?Ù?Ù?Ù? Ø£Ù? ØªØ£ØªÙ? Ø§Ù?ØØ²Ù? Ø¨Ø´Ù?Ù? Ø¹Ø´Ù?Ø§Ø¦Ù?! Ù?Ø±Ø¬Ù? Ø£Ù? ØªØªØÙ?Ù? Ù?Ù? Ø£Ù?Ù? Ù?Ø¯ ØªÙ?Ù?Ù?Øª\n"
@@ -585,16 +472,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Ø´Ù?Ø±Ø§Ù? Ø¹Ù?Ù? Ø·Ù?Ø¨Ù?. ØªÙ? Ù?Ù?Ù?Ù? Ø¨Ù?Ø¬Ø§Ø. ØØ§Ù?Ù?Ø§Ù? ØªØªÙ?\n"
@@ -603,34 +486,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
-"    Ø¥Ù? Ù?Ù? ØªØµÙ? Ø§Ù?ØØ²Ù?Ø©Ø? Ù?Ø¯ ØªÙ?Ù?Ù? Ø£Ù?Ø¨Ø± Ù?Ù?Ø§ Ù?Ø³Ù?Ø Ø¨Ù? Ù?Ø²Ù?Ø¯ Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø®Ø§ØµØªÙ?.\n"
+"    Ø¥Ù? Ù?Ù? ØªØµÙ? Ø§Ù?ØØ²Ù?Ø©Ø? Ù?Ø¯ ØªÙ?Ù?Ù? Ø£Ù?Ø¨Ø± Ù?Ù?Ø§ Ù?Ø³Ù?Ø Ø¨Ù? Ù?Ø²Ù?Ø¯ Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? "
+"Ø®Ø§ØµØªÙ?.\n"
 "    ØØ§Ù?Ù? Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø±Ø³Ø§Ù? Ø±Ø³Ø§Ù?ØªÙ? Ù?Ù? ØØ³Ø§Ø¨ Ø¨Ø±Ù?Ø¯ GMAIL.COM Ø£Ù? YAHOO.CN. Ù?Ù?Ø§\n"
 "    Ù?Ù?Ù?Ù?Ù? Ø£Ù? ØªØØ§Ù?Ù? Ø·Ù?Ø¨ ØØ²Ù?Ø© Ù?ØªØµÙ?Ø ØªÙ?Ø± tor-browser-bundle Ø¹Ù?Ø¶Ø§Ù? Ø¹Ù? ØØ²Ù?Ø©\n"
 "    ØªÙ?Ø± Ù?Ù?ØªØµÙ?Ø Ù?Ø§Ù?ØªØ±Ø§Ø³Ù? Ø§Ù?Ù?Ø¨Ø§Ø´Ø± tor-im-browser-bundle Ø¨Ù?Ø§ Ø£Ù?Ù?Ø§ Ø£ØµØºØ±.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "    Ù?Ù?Ø£Ø³Ù? Ù?ØÙ? ØØ§Ù?Ù?Ø§Ù? Ù?Ù?Ø± Ø¨Ù?Ø´Ø§Ù?Ù? ØªÙ?Ù?Ù?Ø© Ù?Ù?Ø§ Ù?Ù?Ù?Ù?Ù?Ø§ ØªÙ?Ø¨Ù?Ø©\n"
@@ -640,6 +515,41 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    3- Ø£Ø¹Ø¯ ØªØ³Ù?Ù?Ø© Ø§Ù?Ù?Ù?Ù? Ø§Ù?Ù?Ù?ØªÙ?Ù? Ø¨Ù? \"ex_RENAME.\" Ù?Ù?Ù?ØªÙ?Ù? Ø¨Ù? \"exe.\" Ù?\n"
+#~ "        Ø£Ù?Ø¶Ø§Ù? Ø£Ø¹Ø¯ ØªØ³Ù?Ù?Ø© Ø§Ù?Ù?Ù?Ù? Ø§Ù?Ù?Ù?ØªÙ?Ù? Ø¨Ù? \"ex_RENAME.asc.\" Ù?Ù?Ù?ØªÙ?Ù? Ø¨Ù?\n"
+#~ "        \"exe.asc.\"\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Ø§Ù?Ø¯Ø¹Ù?\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "        gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
 #~ "\n"
 #~ "    Unfortunately, we won't answer you at this address. You should make\n"
@@ -647,10 +557,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -819,8 +731,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -846,7 +758,8 @@ msgstr ""
 #~ "\n"
 #~ "Ø§Ù?Ø¥Ø®Ø±Ø§Ø¬ Ù?Ù?Ø¨ØºÙ? Ø£Ù? Ù?Ù?Ø¸Ø± Ø¥Ù?Ù? ØØ¯ Ù?Ø§ Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ù?Ø¨Ù?Ù? : \n"
 #~ "\n"
-#~ "Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ø¹Ø§Ù?Ø© Ø§Ù?Ø¹Ø§Ù?Ù?Ù?Ø© : Ø§Ù?ØªÙ?Ù?Ù?Ø¹ Ø¬Ù?Ø¯ Ù?Ù? \"Roger Dingledine <arma@xxxxxxx>\"  \n"
+#~ "Ø§Ù?Ù?Ù?Ø§Ù?Ø¹ Ø§Ù?Ø¹Ø§Ù?Ø© Ø§Ù?Ø¹Ø§Ù?Ù?Ù?Ø© : Ø§Ù?ØªÙ?Ù?Ù?Ø¹ Ø¬Ù?Ø¯ Ù?Ù? \"Roger Dingledine <arma@xxxxxxx>"
+#~ "\"  \n"
 #~ "\n"
 #~ "Ø¥Ø°Ø§ Ù?Ù?Øª Ù?Ù? ØªÙ?Ù? Ù?Ø£Ù?Ù?Ù?Ø© Ù?Ø¹ Ø£Ø¯Ù?Ø§Øª Ø³Ø·Ø± Ø§Ù?Ø£Ù?Ø§Ù?Ø± Ø? Ù?Ù?ØØ§Ù?Ù?Ø© Ø§Ù?Ø¨ØØ« Ø¹Ù? \n"
 #~ "Ù?Ø§Ø¬Ù?Ø© Ù?Ø³ØªØ®Ø¯Ù? Ø±Ø³Ù?Ù?Ù?Ø© Ù?GnuPG Ø¹Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ù?Ø¹ : \n"
@@ -868,8 +781,8 @@ msgstr ""
 #~ "Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ù?Ù?Ù?Ø¹ : https://bridges.torproject.org / \n"
 #~ "\n"
 #~ "Ø¥Ø°Ø§ Ù?Ø§Ù? Ù?Ø¯Ù?Ù? Ø£Ù? Ø£Ø³Ø¦Ù?Ø© Ø£Ù? Ø£Ù?Ù? Ù?Ø§ Ù?Ø¹Ù?Ù? Ø? Ù?Ù?Ù?Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¹Ù?Ù? \n"
-#~ "Ø§Ù?Ø¥Ù?Ø³Ø§Ù? Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ø¯Ø¹Ù? Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? : tor-assistants@xxxxxxxxxxxxxx "
-#~ "\n"
+#~ "Ø§Ù?Ø¥Ù?Ø³Ø§Ù? Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ø¯Ø¹Ù? Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? : tor-assistants@torproject."
+#~ "org \n"
 #~ " "
 
 #~ msgid ""
@@ -909,8 +822,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -967,15 +880,15 @@ msgstr ""
 #~ "Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ù?Ù?Ù?Ø¹ : https://bridges.torproject.org / \n"
 #~ "\n"
 #~ "Ø¥Ø°Ø§ Ù?Ø§Ù? Ù?Ø¯Ù?Ù? Ø£Ù? Ø£Ø³Ø¦Ù?Ø© Ø£Ù? Ø£Ù?Ù? Ù?Ø§ Ù?Ø¹Ù?Ù? Ø? Ù?Ù?Ù?Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¹Ù?Ù? \n"
-#~ "Ø§Ù?Ø¥Ù?Ø³Ø§Ù? Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ø¯Ø¹Ù? Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? : tor-assistants@xxxxxxxxxxxxxx "
-#~ "\n"
+#~ "Ø§Ù?Ø¥Ù?Ø³Ø§Ù? Ù?Ù? Ù?Ø°Ø§ Ø§Ù?Ø¯Ø¹Ù? Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? : tor-assistants@torproject."
+#~ "org \n"
 
 #~ msgid ""
 #~ "\n"
 #~ "    Hello, This is the \"GetTor\" robot.\n"
 #~ "\n"
-#~ "    Thank you for your request. It was successfully understood. Your request "
-#~ "is\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"
@@ -998,8 +911,8 @@ msgstr ""
 #~ "Ù?Ø¹Ø§Ù?Ø¬Ø© Ø·Ù?Ø¨Ù?. Ø³ØªØµÙ? Ø§Ù?ØØ²Ù?Ø© Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù? Ø®Ù?Ø§Ù? Ø§Ù?Ø¹Ø´Ø± Ø¯Ù?Ø§Ø¦Ù?\n"
 #~ "Ø§Ù?Ù?Ù?Ø¨Ù?Ø©.\n"
 #~ "\n"
-#~ "Ø¥Ù? Ù?Ù? ØªØµÙ?Ù? Ø§Ù?ØØ²Ù?Ø©Ø? Ù?Ù? Ø§Ù?Ù?Ù?Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? ØØ¬Ù?Ù?Ø§ Ø£Ù?Ø¨Ø± Ù?Ù? Ø§Ù?ØØ¬Ù? Ø§Ù?Ø°Ù? Ù?Ø³Ù?Ø Ø¨Ù? Ù?Ù?Ø¯Ù? "
-#~ "Ø®Ø¯Ù?Ø© Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø®Ø§ØµØªÙ?.\n"
+#~ "Ø¥Ù? Ù?Ù? ØªØµÙ?Ù? Ø§Ù?ØØ²Ù?Ø©Ø? Ù?Ù? Ø§Ù?Ù?Ù?Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? ØØ¬Ù?Ù?Ø§ Ø£Ù?Ø¨Ø± Ù?Ù? Ø§Ù?ØØ¬Ù? Ø§Ù?Ø°Ù? Ù?Ø³Ù?Ø Ø¨Ù? "
+#~ "Ù?Ù?Ø¯Ù? Ø®Ø¯Ù?Ø© Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø®Ø§ØµØªÙ?.\n"
 #~ "ØØ§Ù?Ù? Ø¥Ø±Ø³Ø§Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø© Ù?Ø±Ø© Ø£Ø®Ø±Ù? Ù?Ù? Ø¨Ø±Ù?Ø¯ gmail.com Ø£Ù? yahoo.cn. Ø£Ù?Ø¶Ø§Ù?\n"
 #~ "Ù?Ù?Ù?Ù?Ù? Ù?ØØ§Ù?Ù?Ø© Ø·Ù?Ø¨ ØØ²Ù?Ø© Ù?ØªØµÙ?Ø ØªÙ?Ø± Ø¨Ø¯Ù?Ø§Ù? Ù?Ù? Ø·Ù?Ø¨ ØØ²Ù?Ø© Ù?ØªØµÙ?Ø Ù?Ù?Ø³Ù?Ø¬Ø± ØªÙ?Ø±Ø?\n"
 #~ "Ø¨Ù?Ø§ Ø§Ù?Ù?Ø§ Ø£ØµØºØ± ØØ¬Ù?Ø§Ù?.\n"
diff --git a/i18n/arn/gettor.po b/i18n/arn/gettor.po
index e7e6736..a711308 100644
--- a/i18n/arn/gettor.po
+++ b/i18n/arn/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ast/gettor.po b/i18n/ast/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ast/gettor.po
+++ b/i18n/ast/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/az/gettor.po b/i18n/az/gettor.po
index e385e1f..8c2c663 100644
--- a/i18n/az/gettor.po
+++ b/i18n/az/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-11-19 14:44+0200\n"
 "Last-Translator: ulviya <ulviya_g@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "            Salam, Bu \"GetTor\" robotudur.\n"
@@ -33,14 +31,12 @@ msgstr ""
 "\n"
 "             "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "              TÉ?É?ssÃ¼f ki, sizÉ? bu Ã¼nvanda cavab verÉ? bilmÉ?yÉ?cÉ?yik. Siz bunu "
@@ -50,31 +46,28 @@ msgstr ""
 "\n"
 "                 "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "                  Biz yalnÄ±z \"DKÄ°M-i\" dÉ?stÉ?klÉ?yÉ?n elektron poÃ§t "
 "xidmÉ?tlÉ?rindÉ?n sorÄ?ularÄ± prosesini aparaÄ±rÄ±q,\n"
-"                           \"XÉ?tdÉ?n\" faktiki olaraq poÃ§tu gÃ¶ndÉ?rmiÅ? biridir.\n"
+"                           \"XÉ?tdÉ?n\" faktiki olaraq poÃ§tu gÃ¶ndÉ?rmiÅ? "
+"biridir.\n"
 "\n"
 "\n"
 "                        "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "               Æ?gÉ?r siz bu poÃ§t Ã¼Ã§Ã¼n soruÅ?madÄ±nÄ±zsa (biz Ã¼zr istÉ?yirik. "
@@ -86,13 +79,11 @@ msgstr ""
 "\n"
 "                  "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "             LÃ¼tfÉ?n hal-hazÄ±rda qeyd edin, biz HTML elektron poÃ§tlarÄ±nÄ± vÉ? "
@@ -101,13 +92,11 @@ msgstr ""
 "\n"
 "            "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "                Æ?gÉ?r sizin hÉ?r nasÄ± sulalÄ±nÄ±z varsa vÉ? ya bu iÅ?lÉ?mirsÉ?, siz "
@@ -117,13 +106,11 @@ msgstr ""
 " \n"
 "               "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "                 Æ?gÉ?r siz mÉ?nÉ? hÉ?r hansÄ±sa istÉ?diyinizi desÉ?niz mÉ?n sizÉ? Tor "
@@ -132,13 +119,11 @@ msgstr ""
 "\n"
 "                "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "                  LÃ¼tfÉ?n bu poÃ§ta (gettor@xxxxxxxxxxxxxxxx) cavab verin vÉ? "
@@ -148,23 +133,19 @@ msgstr ""
 "\n"
 "           "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "               TOR-un MÆ?HDUDLAÅ?DIRILAN VERSÄ°YALARINI Æ?LDÆ? ETMÆ?K\n"
 "               "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "               Sizin dilinizÉ? tÉ?rcÃ¼mÉ? edilÉ?n Tor versiyasÄ±nÄ± almaq, mÃ¼É?yyÉ?n "
@@ -173,42 +154,36 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
-"               Bu nÃ¼munÉ? mÉ?hdudlaÅ?dÄ±rÄ±landa sizÉ? tÉ?lÉ?b edilÉ?n paketi verÉ?cÉ?k\n"
+"               Bu nÃ¼munÉ? mÉ?hdudlaÅ?dÄ±rÄ±landa sizÉ? tÉ?lÉ?b edilÉ?n paketi "
+"verÉ?cÉ?k\n"
 "                 codes.\n"
 "\n"
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "                DÉ?stÉ?klÉ?nmiÅ?  yerlÉ?rin  siyahÄ±sÄ±:\n"
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "                  Budur bÃ¼tÃ¼n mÃ¼mkÃ¼n dillÉ?rin siyahÄ±sÄ±:\n"
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -219,9 +194,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: Æ?rÉ?b\n"
@@ -237,36 +210,29 @@ msgstr ""
 "gettor+zh@xxxxxxxxxxxxxx: Ã?in\n"
 "\n"
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "            É?gÉ?r siz heÃ§ bir dil seÃ§mÉ?miÅ?sinizsÉ?, onda Ä°ngilis dili variantÄ± "
 "qÉ?bul edÉ?cÉ?ksiniz.\n"
 "\n"
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "                       SMALLER SIZED PACKAGES\n"
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "                   Æ?gÉ?r sizin bandwith-iniz aÅ?aÄ?Ä±dÄ±rsa vÉ? ya sizin "
@@ -279,23 +245,19 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
-"             SadÉ?cÉ? elektron poÃ§tunuzda haradasa  aÃ§ar sÃ¶z 'parÃ§alanmasÄ±nÄ±' "
-" Ã¶zÃ¼ndÉ? saxlayÄ±n daxil edin:\n"
+"             SadÉ?cÉ? elektron poÃ§tunuzda haradasa  aÃ§ar sÃ¶z 'parÃ§alanmasÄ±nÄ±'  "
+"Ã¶zÃ¼ndÉ? saxlayÄ±n daxil edin:\n"
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "             GetTor-a elektron poÃ§tda bu mÉ?tni gÃ¶ndÉ?rmÉ?k sizÉ? gÃ¶ndÉ?rmÉ?yÉ? "
@@ -303,13 +265,11 @@ msgstr ""
 "                             bir neÃ§É? 1,4MB É?lavÉ?sindÉ? Tor SÉ?yyah DÉ?stÉ?si.\n"
 "\n"
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "                     BÃ¼tÃ¼n hissÉ?lÉ?ri alandan sonra, sizin onlarÄ± yenidÉ?n "
@@ -317,25 +277,20 @@ msgstr ""
 "                     yenidÉ?n bir paketÉ?.Bu aÅ?aÄ?Ä±dakÄ± qaydada edilir:\n"
 "\n"
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "                     1.) BÃ¼tÃ¼n qÉ?bul edilÉ?n É?lavÉ?lÉ?ri diskinizdÉ?ki qovluÄ?da "
 "saxlayÄ±n.\n"
 "               \n"
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
 "                    2). \".z-dÉ?\" qurtaran bÃ¼tÃ¼n fayllar zÉ?ncirbÉ?ndi aÃ§Ä±n. "
@@ -345,31 +300,11 @@ msgstr ""
 "\n"
 "                   "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"                      3). \".exe-dÉ?\" qurtarmaq Ã¼Ã§Ã¼n \".ex_RENAME-dÉ?\" qurtaran "
-"faylÄ±n adÄ±nÄ± dÉ?yiÅ?in\n"
-"                       hÉ?mÃ§inin qurtarmaq Ã¼Ã§Ã¼n \".ex_RENAME.asc-da\" qurtaran "
-"faylÄ±n adÄ±nÄ± dÉ?yiÅ?in \n"
-"                       \".exe.asc\"\n"
-"\n"
-"          "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "                4). BÃ¼tÃ¼n fayllarÄ± yoxlayÄ±n ,  sizin aldÄ±Ä?Ä±nÄ±z poÃ§tda tÉ?svir "
@@ -378,14 +313,12 @@ msgstr ""
 "\n"
 "          "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "        5). Ä°ndi proqramdan istifadÉ? edin ki, unrar Ã§oxcildli RAR-Ä± "
@@ -395,12 +328,9 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "              Sizin Tor paketinizi aÃ§Ä±b Ã§Ä±xartmaq Ã¼Ã§Ã¼n, \".exe\" faylÄ±nÄ± "
@@ -408,14 +338,12 @@ msgstr ""
 "\n"
 "             "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "             6). AÃ§Ä±lma qurtarÄ±landan sonra,  sizin tÉ?yinat qovluÄ?unuzda bu "
@@ -426,12 +354,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "               7). O budur. Siz hazÄ±rsÄ±nÄ±z. TÉ?Å?É?kkÃ¼rlÉ?r Tordan istifadÉ? "
@@ -439,23 +364,15 @@ msgstr ""
 "                \n"
 "                               "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"               KÃ?MÆ?K\n"
-"            "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "               Budur poÃ§t indeksi faylÄ± kimi sizin tÉ?lÉ?b etdiyiniz proqram "
@@ -464,13 +381,11 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "          Ä°Å?arÉ?: Æ?gÉ?r sizin kompÃ¼terinizÉ? GnuPG yÃ¼klÉ?nibsÉ?, poÃ§t indeksi "
@@ -480,37 +395,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"            gpg <packagename>.asc <packagename>-i tÉ?sdiq edir\n"
-"\n"
-"     "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "           Ã?Ä±xÄ±Å?  buna bir qÉ?dÉ?r bÉ?nzÉ?mÉ?lidir:\n"
 "\n"
 "          "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "                Æ?gÉ?r siz commandline alÉ?tlÉ?ri ilÉ? tanÄ±Å? deyilsinizsÉ?,\n"
@@ -519,22 +417,20 @@ msgstr ""
 "\n"
 "         "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "         Æ?gÉ?r sizin Ä°nternet Tor Å?É?bÉ?kÉ?sinÉ? giriÅ?i qadaÄ?a qoyursa,\n"
-"           sizin kÃ¶rpÃ¼ dÉ?yiÅ?mÉ?lÉ?rinÉ? ehtiyacÄ±nÄ±z olacaq. KÃ¶rpÃ¼ "
-"dÉ?yiÅ?mÉ?lÉ?ri(yaxud qÄ±saca  \"kÃ¶rpÃ¼lÉ?r\")\n"
+"           sizin kÃ¶rpÃ¼ dÉ?yiÅ?mÉ?lÉ?rinÉ? ehtiyacÄ±nÄ±z olacaq. KÃ¶rpÃ¼ dÉ?yiÅ?mÉ?lÉ?ri"
+"(yaxud qÄ±saca  \"kÃ¶rpÃ¼lÉ?r\")\n"
 "  Kataloqa É?sasÉ?n sadalanan Tor dÉ?yiÅ?mÉ?lÉ?ridir.\n"
 "  Bir halda ki onlarÄ±n heÃ§ bir tam ictimai siyahÄ±larÄ± yoxdur, hÉ?tta É?gÉ?r "
 "sizin Ä°SP-iniz bÃ¼tÃ¼nÉ? É?laqÉ?lÉ?ri filtrlÉ?yirsÉ?,\n"
@@ -543,15 +439,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "             Siz nÃ¶vbÉ?ti elektron poÃ§t Ã¼nvanÄ±na elektron poÃ§tun tÉ?rkibinÉ?\n"
@@ -561,14 +453,11 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "                Bu hÉ?mÃ§inin nÃ¶vbÉ?ti veb-sÉ?yyah ilÉ? kÃ¶rpÃ¼lÉ?ri gÉ?tirmÉ?k Ã¼Ã§Ã¼n "
@@ -577,16 +466,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "              VACÄ°B QEYD:\n"
@@ -599,13 +486,11 @@ msgstr ""
 "\n"
 "                                 "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "             PaketlÉ?r qaydadan Ã§Ä±xa bilÉ?rdi! LÃ¼tfÉ?n É?min olun,\n"
@@ -614,16 +499,12 @@ msgstr ""
 "\n"
 "     "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "                Sizin sorÄ?unuz Ã¼Ã§Ã¼n tÉ?Å?É?kkÃ¼r edirik. Bu mÃ¼vÉ?ffÉ?qiyyÉ?tlÉ? baÅ?a "
@@ -634,16 +515,11 @@ msgstr ""
 "\n"
 "  "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "         Æ?gÉ?r gÉ?lib Ã§atmÄ±rsa, paket sizin poÃ§t tÉ?chizatÃ§Ä±nÄ±z Ã¼Ã§Ã¼n hÉ?ddindÉ?n "
@@ -656,15 +532,11 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "      TÉ?É?ssÃ¼f ki biz hal-hazÄ±rda problemlÉ?ri sinaqdan keÃ§iririk  vÉ? biz bu "
@@ -672,3 +544,40 @@ msgstr ""
 "           LÃ¼tfÉ?n sÉ?birli olun, biz bu problemi  hÉ?ll etmÉ?yÉ? cÉ?hd edirik.\n"
 "\n"
 "   "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "                      3). \".exe-dÉ?\" qurtarmaq Ã¼Ã§Ã¼n \".ex_RENAME-dÉ?\" "
+#~ "qurtaran faylÄ±n adÄ±nÄ± dÉ?yiÅ?in\n"
+#~ "                       hÉ?mÃ§inin qurtarmaq Ã¼Ã§Ã¼n \".ex_RENAME.asc-da\" "
+#~ "qurtaran faylÄ±n adÄ±nÄ± dÉ?yiÅ?in \n"
+#~ "                       \".exe.asc\"\n"
+#~ "\n"
+#~ "          "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "               KÃ?MÆ?K\n"
+#~ "            "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "            gpg <packagename>.asc <packagename>-i tÉ?sdiq edir\n"
+#~ "\n"
+#~ "     "
diff --git a/i18n/be/gettor.po b/i18n/be/gettor.po
index e7e6736..a711308 100644
--- a/i18n/be/gettor.po
+++ b/i18n/be/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/bg/gettor.po b/i18n/bg/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/bg/gettor.po
+++ b/i18n/bg/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/bms/gettor.po b/i18n/bms/gettor.po
index d0abf6a..515d1f6 100644
--- a/i18n/bms/gettor.po
+++ b/i18n/bms/gettor.po
@@ -7,23 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "    á??á??á?¤á??á?¬á??á?« \"GetTor\" robot á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
@@ -32,111 +31,92 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
-"    á??á?®á??á?á??á?¹á??á?¬á??á?½á? á??á??á?¹á?·á??á?á?¯ á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á?? á?±á?»á??á?¾á??á?¬á?¸ á?±á??á?¸á??á?á?¯á??á?¹á??á?á??á?¹á?·á??á??á?¹ á??á??á?¯á??á?¹á??á?«á??    "
-"GMAIL.COM á??á?á?¯á??á??á??á?¯á??á?¹ YAHOO.CN á?¡á?±á??á?¬á??á?¹á?·á??á?ºá?¬á?¸á?»á??á??á?¹á?· á?»á??á?³á??á?¯á??á?¹á??á??á?¹á?·á?»á??á?®á?¸\n"
+"    á??á?®á??á?á??á?¹á??á?¬á??á?½á? á??á??á?¹á?·á??á?á?¯ á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á?? á?±á?»á??á?¾á??á?¬á?¸ á?±á??á?¸á??á?á?¯á??á?¹á??á?á??á?¹á?·á??á??á?¹ á??á??á?¯á??á?¹á??á?«á??    GMAIL.COM á??á?á?¯á??á??á??á?¯á??á?¹ YAHOO."
+"CN á?¡á?±á??á?¬á??á?¹á?·á??á?ºá?¬á?¸á?»á??á??á?¹á?· á?»á??á?³á??á?¯á??á?¹á??á??á?¹á?·á?»á??á?®á?¸\n"
 "                á??á?¡á?±á??á?¬á??á?¹á?·á??á??á?¹á??á?¯á??á?¯á?»á??á??á?¹á?·\n"
 "    á?±á??á?¸á??á?á?¯á??á?±á??á?¸á??á?«á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
-"     \"From\" á??á?á?¯á??á?¹á?¸á??á?²á??á?¼á??á?¹ á?¡á??á?½á??á?¹á??á??á??á?¹ á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á?¯á??á??á?²á?·á??á?°á?? á??á?á??á?¹á??á?¬á??á?á?¯ "
-"á??á??á?¹á?±á??á?¸á??á?á?¯á??á?¹á??á??á?¹á?·\n"
+"     \"From\" á??á?á?¯á??á?¹á?¸á??á?²á??á?¼á??á?¹ á?¡á??á?½á??á?¹á??á??á??á?¹ á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á?¯á??á??á?²á?·á??á?°á?? á??á?á??á?¹á??á?¬á??á?á?¯ á??á??á?¹á?±á??á?¸á??á?á?¯á??á?¹á??á??á?¹á?·\n"
 "      á?¡á?®á?¸á?±á??á?¸á??á?¹ feature á??á??á?¹á??á?¯ á?»á??á??á?¹á?±á??á?¬  \"DKIM\" á??á?á?¯\n"
-"     á?¡á?±á??á?¬á??á?¹á??á?°á?±á??á?¸á??á??á?¹á?· á?¡á?®á?¸á?±á??á?¸á??á?¹á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á??á?®á??á?½ á?±á??á?¬á??á?¹á?¸á??á?á?¯á??á?ºá?¬á?¸á??á?á?¯á??á?¬ "
-"á??á?¯á??á?¹á?±á??á?¬á??á?¹á?±á??á?¸á??á?«á??á??á?¹á??\n"
+"     á?¡á?±á??á?¬á??á?¹á??á?°á?±á??á?¸á??á??á?¹á?· á?¡á?®á?¸á?±á??á?¸á??á?¹á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á??á?®á??á?½ á?±á??á?¬á??á?¹á?¸á??á?á?¯á??á?ºá?¬á?¸á??á?á?¯á??á?¬ á??á?¯á??á?¹á?±á??á?¬á??á?¹á?±á??á?¸á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
-"    á??á?®á?±á??á?¸á??á?¹á?¡á??á?¼á??á?¹ á??á??á?¹á??á?±á??á?¸á??á?²á?·á??á?á??á?°á?¸á??á?á?¯á??á??á?¹ á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á??á?¡á?±á??á??á?²á?? á?±á??á?¬á??á?¹á?¸á??á??á?¹á??á?«á??á??á?¹á?? "
-"á??á??á?¹á?·á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?¬ DKIM á??á??á?¶á?¯á?¸á??á?²á?· á??á??á?¹á?±á??á?¬á??á?¹á??á??á?»á??á??á?¹á?±á??á??á??á?¹á??á?á?¯á??á??á??á?¹á?¸á??\n"
+"    á??á?®á?±á??á?¸á??á?¹á?¡á??á?¼á??á?¹ á??á??á?¹á??á?±á??á?¸á??á?²á?·á??á?á??á?°á?¸á??á?á?¯á??á??á?¹ á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á??á?¡á?±á??á??á?²á?? á?±á??á?¬á??á?¹á?¸á??á??á?¹á??á?«á??á??á?¹á?? á??á??á?¹á?·á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?¬ DKIM á??á??á?¶á?¯á?¸á??á?²á?· "
+"á??á??á?¹á?±á??á?¬á??á?¹á??á??á?»á??á??á?¹á?±á??á??á??á?¹á??á?á?¯á??á??á??á?¹á?¸á??\n"
 "    á??á?½á??á?¹á?¸á?»á??á??á?ºá??á?¹á?¡á??á?á?¯á??á?ºá?¶á?³á?¸á??á?á?¯ á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á?? á?±á??á?¸á??á?á?¯á??á?±á??á?¸á??á?«á??á??á?¹á??\n"
-"    á?±á??á?¬á??á?¹á??á??á?¹á?±á??á?? á??á?á?¯á??á??á??á?¯á??á?¹ á??á?á?¯á??á??á??á?¹á?¾á??á?¬á??á?½á?ºá??á?¹á?±á??á?¬á?· á??á??á?¹á?¸á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á??á?¹á??á?¬á??á?á?¯ "
-"á??á??á?¹á??á?ºá?´á??á??á??á?á?¯á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
+"    á?±á??á?¬á??á?¹á??á??á?¹á?±á??á?? á??á?á?¯á??á??á??á?¯á??á?¹ á??á?á?¯á??á??á??á?¹á?¾á??á?¬á??á?½á?ºá??á?¹á?±á??á?¬á?· á??á??á?¹á?¸á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á??á?¹á??á?¬á??á?á?¯ á??á??á?¹á??á?ºá?´á??á??á??á?á?¯á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
-"   á??á??á?¹á??á?±á??á?¬á??á?½á?¬ HTML á?±á??á?¸á??á?¹á?±á??á?¼ á??á?á?¯á??á??á??á?¯á??á?¹ 64 á?±á??á?¸á??á?¹á?±á??á?¼á??á?á?¯ á??á?¯á??á?¹á?±á??á?¬á??á?¹á?±á??á?¸á??á?á?¯á??á?¹á??á?½á?¬ "
-"á??á??á?¯á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á?á??á?¬á?¸á?±á??á?¸á??á?«á??\n"
+"   á??á??á?¹á??á?±á??á?¬á??á?½á?¬ HTML á?±á??á?¸á??á?¹á?±á??á?¼ á??á?á?¯á??á??á??á?¯á??á?¹ 64 á?±á??á?¸á??á?¹á?±á??á?¼á??á?á?¯ á??á?¯á??á?¹á?±á??á?¬á??á?¹á?±á??á?¸á??á?á?¯á??á?¹á??á?½á?¬ á??á??á?¯á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? "
+"á??á?á??á?¬á?¸á?±á??á?¸á??á?«á??\n"
 "   á??á??á?¹á?·á?¡á?±á??á??á?²á?? á??á?¬á??á?¬á?¸á??á??á?¹á??á??á?¹á?»á??á??á?¹á?· á?±á??á?¸á??á?á?¯á??á??á??á?¹ á??á?á?¯á?¡á??á?¹á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
-"    á?¡á??á??á?¹á??á??á?ºá?¬á?¸ á??á??á?¹á?·á??á?½á?¬ á?±á??á?¸á??á??á?¬ á?±á??á?¸á??á?¼á??á?¹á?¸á??á?½á?á??á??á?¹á??á?² á?»á??á??á?¹á?»á??á??á?¹ á?¡á??á?¯á??á?¹á??á??á?¯á??á?¹á??á?á?¯á??á??á?² "
-"á?»á??á??á?¹á?»á??á??á?¹\n"
+"    á?¡á??á??á?¹á??á??á?ºá?¬á?¸ á??á??á?¹á?·á??á?½á?¬ á?±á??á?¸á??á??á?¬ á?±á??á?¸á??á?¼á??á?¹á?¸á??á?½á?á??á??á?¹á??á?² á?»á??á??á?¹á?»á??á??á?¹ á?¡á??á?¯á??á?¹á??á??á?¯á??á?¹á??á?á?¯á??á??á?² á?»á??á??á?¹á?»á??á??á?¹\n"
 "    á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á??á?¹á??á?¬ : tor-assistants@xxxxxxxxxxxxxx á??á?á?¯á??á??á?¹á??á?¼á??á?¹á??á?á?¯á??á?¹á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
-"    á??á??á?¹á??á??á?¹á??á?¯á??á?á?¯ á??á??á?¹á??á?á?¯á??á?ºá??á?¹á??á?² á??á?á?¯á??á?¬ á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á??á??á?á?¯á?±á?»á??á?¬á??á??á?¹ Tor package "
-"á??á?á?¯á?±á??á?¸á??á?¹á?»á??á??á?¹á?· á?±á??á?¸á??á?á?¯á??á?±á??á?¸á??á?«á??á??á?¹á??\n"
+"    á??á??á?¹á??á??á?¹á??á?¯á??á?á?¯ á??á??á?¹á??á?á?¯á??á?ºá??á?¹á??á?² á??á?á?¯á??á?¬ á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á??á??á?á?¯á?±á?»á??á?¬á??á??á?¹ Tor package á??á?á?¯á?±á??á?¸á??á?¹á?»á??á??á?¹á?· á?±á??á?¸á??á?á?¯á??á?±á??á?¸á??á?«á??á??á?¹á??\n"
 "    á?±á?¡á?¬á??á?¹á??á?« packages á??á?¬á??á??á?¹á??á?ºá?¬á?¸á??á?²á??á?½ á??á??á?¹á??á?¯á??á?á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?«á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? (gettor@xxxxxxxxxxxxxx) á??á?á?¯ á?¡á?±á?¾á??á?¬á??á?¹á?¸á?»á??á??á?¹á??á?«á??\n"
@@ -144,23 +124,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "     á??á??á?¹á?? á??á??á?¹á??á??á?¹á?±á??á??á??á?á?¯á??á?¹á??á?¬ TOR á??á?¬á?¸á??á?½á??á?¹á?¸á??á?á?¯ á??á??á?°á?»á??á??á?¹á?¸\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "    á??á??á?¹á?? á??á?¬á??á?¬á??á??á?¬á?¸á??á?á?¯á?? á?»á??á??á?¹á??á?á?¯á??á?á?¯á?±á??á?¬ Tor á??á?¬á?¸á??á?½á??á?¹á?¸á??á?á?¯ á??á??á?°á??á??á?¹\n"
@@ -168,14 +144,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "   á??á?®á?¥á??á??á?¬á??á??á?¹ á??á??á?¯á??á?¹á??á?¬á?¸á??á?½á??á?¹á?¸ package á??á?á?¯ á?±á??á?¬á??á?¹á?¸á??á?á?¯á?»á??á??á?¹á?¸ á?»á??á??á?¹á??á??á?¹á?? \n"
@@ -184,31 +158,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "    á?¡á?±á??á?¬á??á?¹á?¡á??á?°á?±á??á?¸á?±á??á?¬ á??á??á?¹á??á??á?¹á?±á??á??á??á?ºá?¬á?¸ á??á?¬á??á??á?¹á?¸:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "   á??á??á?½á?á??á?á?¯á??á?¹á?±á??á?¬ á??á?¬á??á?¬á??á??á?¬á?¸á??á?ºá?¬á?¸ á??á?¬á??á??á?¹á?¸á?»á??á??á?¹á??á?«á??á??á?¹á??:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -219,9 +188,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
@@ -238,340 +205,241 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
-"    á?¡á??á??á?¹á?? á??á?¬ á??á?¬á??á?¬á??á??á?¬á?¸á??á?½ á??á?±á??á?¼á?¸á??á?ºá??á?¹á??á?²á?·á??á?½á?ºá??á?¹ á??á??á?¹á??á?¬ á?¡á??á?¤á??á?á??á?¹á??á?¬á?¸á??á?½á??á?¹á?¸á??á?á?¯ "
-"á??á??á?¹á??á?¶á??á??á?½á?á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
+"    á?¡á??á??á?¹á?? á??á?¬ á??á?¬á??á?¬á??á??á?¬á?¸á??á?½ á??á?±á??á?¼á?¸á??á?ºá??á?¹á??á?²á?·á??á?½á?ºá??á?¹ á??á??á?¹á??á?¬ á?¡á??á?¤á??á?á??á?¹á??á?¬á?¸á??á?½á??á?¹á?¸á??á?á?¯ á??á??á?¹á??á?¶á??á??á?½á?á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "    PACKAGE á??á?á?¯á??á?¹á??á?¹á?¡á?±á??á?¸á??á?ºá?¬á?¸\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
-"    á?¡á??á??á?¹á?? á??á??á?¹á?? bandwith á??á??á?¹ á?¡á??á?¼á??á?¹á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?½á?ºá??á?¹ á??á?á?¯á??á??á??á?¯á??á?¹ á??á??á?¹á?? "
-"á?¡á??á?¹á??á?¬á??á??á?¹á??á??á?¹á?±á??á?¬á??á?¹á??á?? á?±á??á?¸á??á?°á?±á??á?¼á??\n"
-"    attachment á?¾á??á?®á?¸á?¾á??á?®á?¸á?±á??á?¼ á??á??á?¹á??á?¶á??á?á?¯á?? á??á?¼á??á?¹á?·á??á?»á??á?³á??á?°á?¸á??á?á?¯á??á??á?¹ GetTor á?? feature á??á?á?¯ "
-"á?¡á??á?¶á?¯á?¸á?»á??á?³á?»á??á?®á?¸ \n"
+"    á?¡á??á??á?¹á?? á??á??á?¹á?? bandwith á??á??á?¹ á?¡á??á?¼á??á?¹á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?½á?ºá??á?¹ á??á?á?¯á??á??á??á?¯á??á?¹ á??á??á?¹á?? á?¡á??á?¹á??á?¬á??á??á?¹á??á??á?¹á?±á??á?¬á??á?¹á??á?? á?±á??á?¸á??á?°á?±á??á?¼á??\n"
+"    attachment á?¾á??á?®á?¸á?¾á??á?®á?¸á?±á??á?¼ á??á??á?¹á??á?¶á??á?á?¯á?? á??á?¼á??á?¹á?·á??á?»á??á?³á??á?°á?¸á??á?á?¯á??á??á?¹ GetTor á?? feature á??á?á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á?»á??á?®á?¸ \n"
 "    á?¡á??á?¼á??á?¹á?¡á??á?¬á?¸á?¡á?¾á??á?®á?¸á??á??á?¹á??á?¯ á?¡á??á?¬á?¸ \n"
 "    á?¡á??á?¼á??á?¹á?¡á??á?¬á?¸á?¡á?±á??á?¸á?±á??á?¸á?±á??á?¼ á??á?¼á?²á?»á??á?®á?¸ á?±á??á?¸á??á?á?¯á??á?±á?¡á?¬á??á?¹ á?»á??á?³á??á?¯á??á?¹á??á?á?¯á??á??á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
-"   á?¤á??á?²á?·á??á?á?¯á?? á??á??á?¹á?? á?±á??á?¸á??á?¹á??á?¼á??á?¹ keyword á?»á??á??á?¹á??á?²á?· 'split' á??á?á?¯á??á?²á?· "
-"á??á??á?¬á?¸á??á?¶á?¯á?¸á??á?«á??á??á?¹á??á?½á?¬á??á?«á??:\n"
+"   á?¤á??á?²á?·á??á?á?¯á?? á??á??á?¹á?? á?±á??á?¸á??á?¹á??á?¼á??á?¹ keyword á?»á??á??á?¹á??á?²á?· 'split' á??á?á?¯á??á?²á?· á??á??á?¬á?¸á??á?¶á?¯á?¸á??á?«á??á??á?¹á??á?½á?¬á??á?«á??:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "     GetTor á??á?á?¯ á?¤á??á?¬á??á?¬á?¸á?»á??á??á?¹á?· á?±á??á?¸á??á?á?¯á??á?»á??á??á?¹á?¸á?»á??á??á?¹á?· \n"
-"     1,4MB á??á?½á?á??á?²á?· attachment á?±á??á?¼á?¡á?»á??á??á?¹ Tor Browser á?¡á??á?¯á?±á??á?¸ á??á?á?¯ á??á??á?¹á?·á??á?® "
-"á?±á??á?¸á??á?á?¯á??á?±á??á?¸á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? \n"
+"     1,4MB á??á?½á?á??á?²á?· attachment á?±á??á?¼á?¡á?»á??á??á?¹ Tor Browser á?¡á??á?¯á?±á??á?¸ á??á?á?¯ á??á??á?¹á?·á??á?® á?±á??á?¸á??á?á?¯á??á?±á??á?¸á??á?½á?¬ "
+"á?»á??á??á?¹á??á?«á??á??á?¹á?? \n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
-"    á?¡á??á?á??á?¹á??á?á?¯á??á?¹á?¸á?±á??á?¼á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á??á?¹á??á?¶á??á??á?½á?á?»á??á?®á?¸á??á?¬á??á?²á?? package á??á??á?¹á??á?¯á??á??á?¹á?¸ á?»á??á??á?¹á?±á?¡á?¬á??á?¹ "
-"á?»á??á??á?¹á??á??á?¹ á??á?¯á??á??á?¹á?¸á?±á??á?¸á??á?á?¯á?? á??á?á?¯á?¡á??á?¹á??á?«á??á??á?¹á??\n"
+"    á?¡á??á?á??á?¹á??á?á?¯á??á?¹á?¸á?±á??á?¼á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á??á?¹á??á?¶á??á??á?½á?á?»á??á?®á?¸á??á?¬á??á?²á?? package á??á??á?¹á??á?¯á??á??á?¹á?¸ á?»á??á??á?¹á?±á?¡á?¬á??á?¹ á?»á??á??á?¹á??á??á?¹ á??á?¯á??á??á?¹á?¸á?±á??á?¸á??á?á?¯á?? "
+"á??á?á?¯á?¡á??á?¹á??á?«á??á??á?¹á??\n"
 "    á?±á?¡á?¬á??á?¹á?±á??á?¬á?¹á?»á??á??á?«á?¡á??á?á?¯á??á?¹á?¸ á?»á??á?®á?¸á?±á?»á??á?¬á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
-"     á??.)á??á??á?¹á??á?¶á??á??á?½á?á?»á??á?®á?¸á??á?¬á?¸ attachment á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ folder á??á??á?¹á??á?¯á??á?²á??á?¼á??á?¹ "
-"á??á?á??á?¹á?¸á??á?¬á?¸á??á??á?«á??á??á?¹á??\n"
+"     á??.)á??á??á?¹á??á?¶á??á??á?½á?á?»á??á?®á?¸á??á?¬á?¸ attachment á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ folder á??á??á?¹á??á?¯á??á?²á??á?¼á??á?¹ á??á?á??á?¹á?¸á??á?¬á?¸á??á??á?«á??á??á?¹á??\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:529
-msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"    á??.) \".z\" á??á?½á??á?¹á?·á?¡á??á?¶á?¯á?¸á??á??á?¹á?±á??á?¬ á??á?á?¯á??á?¹á??á?ºá?¬á?¸á??á?á?¯ Unzip á??á?¯á??á?¹á??á?«á?? á?¡á??á??á?¹á?? attachment "
-"á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á?á??á?¹á?¸á?»á??á?®á?¸á?»á??á?®á??á?á?¯á??á??á?¹    folder á?¡á??á??á?¹á??á??á?¹á??á?¯á?¡á??á??á?¹á??á?¯á??á?¹ á?»á??á?®á?¸á??á??á?¹ á?¡á?²á?·á??á?á??á?²á??á?½á?¬ "
-"á??á?á?¯á??á?¹á?±á??á?¼á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á?á?¯á?¸á??á?á?¯á?¸á??á?½á??á?¹á?¸á??á?½á??á?¹á?¸á??á?² unzip á?»á??á?³á??á?¯á??á?¹á??á??á?½á?¬á??á?«á??\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"     á??.) \".ex_RENAME\" á??á?½á??á?¹á?·á??á?¶á?¯á?¸á?±á??á?¬ á??á?á?¯á??á?¹á??á?á?¯ \".exe\" á??á?°á?? "
-"á??á?¬á??á??á?¹á?»á??á??á?¹á?±á?»á??á?¬á??á?¹á?¸á?±á??á?¸á??á??á?½á?¬á?»á??á??á?¹á?»á??á?®á?¸\n"
-"          \".ex_RENAME.asc\" á??á?½á??á?¹á?·á??á?¶á?¯á?¸á?±á??á?¬ á??á?á?¯á??á?¹á??á?á?¯á??á??á?¹á?¸ \".exe.asc\" á??á?°á?? "
-"á??á?¬á??á??á?¹á?»á??á??á?¹á?±á?»á??á?¬á??á?¹á?¸á?±á??á?¸á??á??á?½á?¬á??á?«á??\n"
+"    á??.) \".z\" á??á?½á??á?¹á?·á?¡á??á?¶á?¯á?¸á??á??á?¹á?±á??á?¬ á??á?á?¯á??á?¹á??á?ºá?¬á?¸á??á?á?¯ Unzip á??á?¯á??á?¹á??á?«á?? á?¡á??á??á?¹á?? attachment á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ "
+"á??á?á??á?¹á?¸á?»á??á?®á?¸á?»á??á?®á??á?á?¯á??á??á?¹    folder á?¡á??á??á?¹á??á??á?¹á??á?¯á?¡á??á??á?¹á??á?¯á??á?¹ á?»á??á?®á?¸á??á??á?¹ á?¡á?²á?·á??á?á??á?²á??á?½á?¬ á??á?á?¯á??á?¹á?±á??á?¼á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á?á?¯á?¸á??á?á?¯á?¸á??á?½á??á?¹á?¸á??á?½á??á?¹á?¸á??á?² unzip "
+"á?»á??á?³á??á?¯á??á?¹á??á??á?½á?¬á??á?«á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "    á??.)package á??á??á?¹á??á?¯á??á?ºá??á?¹á?¸á??á?®á??á?½á??á?¹á?·á?¡á??á?° \n"
-"        á??á??á?¹á??á?¶á??á??á?½á?á?±á??á?¬ á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?¼á??á?¹ á?±á??á?¬á?¹á?»á??á??á?¬á?¸á?±á??á?¬ á??á?á?¯á??á?¹á??á?ºá?¬á?¸á??á?á?¯ "
-"á??á?½á??á?¹á??á??á?½á??á?¹á??á??á?¹á?±á??á?¸á??á?«á??(gpg --verify)\n"
+"        á??á??á?¹á??á?¶á??á??á?½á?á?±á??á?¬ á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?¼á??á?¹ á?±á??á?¬á?¹á?»á??á??á?¬á?¸á?±á??á?¬ á??á?á?¯á??á?¹á??á?ºá?¬á?¸á??á?á?¯ á??á?½á??á?¹á??á??á?½á??á?¹á??á??á?¹á?±á??á?¸á??á?«á??(gpg --verify)\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
-"     á??.) á??á?ºá?¬á?¸á??á?¼á?¬á?±á??á?¬ RAR archives á??á?ºá?¬á?¸á??á?á?¯ unrar á?»á??á??á?¹á?»á??á??á?¹á??á?á?¯á??á?¹á?±á??á?¬ á??á??á?á?¯á??á??á??á?¹á??á?á?¯ "
-"á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??\n"
+"     á??.) á??á?ºá?¬á?¸á??á?¼á?¬á?±á??á?¬ RAR archives á??á?ºá?¬á?¸á??á?á?¯ unrar á?»á??á??á?¹á?»á??á??á?¹á??á?á?¯á??á?¹á?±á??á?¬ á??á??á?á?¯á??á??á??á?¹á??á?á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??\n"
 "          Windows á??á?ºá?¬á?¸á?±á??á??á??á?¼á??á?¹á?±á??á?¬á?· á??á?¶á?¯á?¸á??á?¶á?¡á??á?¯á?á??á?¹á?¸ WinRAR á??á?½á?á??á?«á??á??á?¹á??\n"
-"          á?¡á??á??á?¹á?? á??á??á?¹á?·á??á?¼á??á?¹á?»á??á?´á??á?¬á??á?½á?¬ install á??á??á?¯á??á?¹á??á?±á??á?¸á??á?°á?¸ á??á?á?¯á??á??á?¹á?±á??á?¬á?· á??á?®á??á?½á?¬ á??á??á?°á??á?« "
-":\n"
+"          á?¡á??á??á?¹á?? á??á??á?¹á?·á??á?¼á??á?¹á?»á??á?´á??á?¬á??á?½á?¬ install á??á??á?¯á??á?¹á??á?±á??á?¸á??á?°á?¸ á??á?á?¯á??á??á?¹á?±á??á?¬á?· á??á?®á??á?½á?¬ á??á??á?°á??á?« :\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
-"         Tor package á??á?ºá?¬á?¸á??á?á?¯ á?»á??á??á?¹á?»á??á??á?¹á??á??á?¹ á?¡á??á?á?¯á?¸á??á?½á??á?¹á?¸á??á?¶á?¯á?¸á??á?±á??á?¬á?· \".exe\" á??á?á?¯á??á?¹á??á?á?¯ "
-"á??á??á??á?¹á??á??á?ºá??á?¹á??á?½á?á??á?¹á??á?«á??\n"
+"         Tor package á??á?ºá?¬á?¸á??á?á?¯ á?»á??á??á?¹á?»á??á??á?¹á??á??á?¹ á?¡á??á?á?¯á?¸á??á?½á??á?¹á?¸á??á?¶á?¯á?¸á??á?±á??á?¬á?· \".exe\" á??á?á?¯á??á?¹á??á?á?¯ á??á??á??á?¹á??á??á?ºá??á?¹á??á?½á?á??á?¹á??á?«á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "    á??.) á?»á??á??á?¹á?»á??á??á?¹á??á?¬ á?»á??á?®á?¸á??á?¼á?¬á?¸á??á?²á?·á??á?½á?ºá??á?¹ á??á??á?¹á??á??á?¹á??á?¼á??á?¹á??á?¬ folder á??á?²á??á?¼á??á?¹\n"
 "         á?¡á??á??á?¹á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸á?±á??á?¬  \".exe\" á??á?á?¯á??á?¹á??á?á?¯ á??á?½á?¬á?±á??á?¼á??á??á??á?¹á?? \n"
-"         á??á?á?¯á?¸á??á?½á??á?¹á?¸á??á?¼á?¬á??á?² á??á??á??á?¹á??á??á?ºá??á?¹á??á?½á?á??á?¹á??á?á?¯á??á?¹á??á??á?¹á?±á??á?¬á?· Tor Browser á?¡á??á?¯á?±á??á?¸á??á?¬ "
-"á??á??á? á??á?¹á??á??á?á?¯á??á?¹á?¸á?¡á??á?¼á??á?¹á?¸ á??á??á??á?¹á??á?½á?¬á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
+"         á??á?á?¯á?¸á??á?½á??á?¹á?¸á??á?¼á?¬á??á?² á??á??á??á?¹á??á??á?ºá??á?¹á??á?½á?á??á?¹á??á?á?¯á??á?¹á??á??á?¹á?±á??á?¬á?· Tor Browser á?¡á??á?¯á?±á??á?¸á??á?¬ á??á??á? á??á?¹á??á??á?á?¯á??á?¹á?¸á?¡á??á?¼á??á?¹á?¸ "
+"á??á??á??á?¹á??á?½á?¬á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
-"    á??.) á??á?®á?±á??á?¬á??á?¹á??á?«á??á?² á?»á??á?®á?¸á??á?¼á?¬á?¸á??á?«á?»á??á?®á?? Tor á??á?á?¯á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?²á?·á?¡á??á?¼á??á?¹ á?±á??á?ºá?¸á??á?°á?¸á??á??á?¹á??á?«á??á??á?¹á?? "
-"á?±á??á?ºá?¬á?¹á??á??á??á?¹á??á?«á?±á??!\\    \n"
+"    á??.) á??á?®á?±á??á?¬á??á?¹á??á?«á??á?² á?»á??á?®á?¸á??á?¼á?¬á?¸á??á?«á?»á??á?®á?? Tor á??á?á?¯á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?²á?·á?¡á??á?¼á??á?¹ á?±á??á?ºá?¸á??á?°á?¸á??á??á?¹á??á?«á??á??á?¹á?? á?±á??á?ºá?¬á?¹á??á??á??á?¹á??á?«á?±á??!"
+"\\    \n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"    SUPPORT\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "    á??á??á?¹á?±á??á?¬á??á?¹á?¸á??á?á?¯á?±á??á?¬ á?±á??á?¬á?·á??á?¹á??á?²á?? zip á??á?á?¯á??á?¹á??á?«á?? \n"
-"    á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? package á??á?á?¯ unzip á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸ á??á?±á??á?¤á??á??á??á?¡á??á?¬á??á?ºá?¬á?¸á??á?á?¯ "
-"á??á?½á??á?¹á??á??á?½á??á?¹á??á??á?¹á?±á??á?¸á??á?«á??\n"
+"    á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? package á??á?á?¯ unzip á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸ á??á?±á??á?¤á??á??á??á?¡á??á?¬á??á?ºá?¬á?¸á??á?á?¯ á??á?½á??á?¹á??á??á?½á??á?¹á??á??á?¹á?±á??á?¸á??á?«á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "   á??á?²á??á?¼á??á?¹á??: á?¡á??á??á?¹á?? á??á??á?¹á?·á??á?¼á??á?¹á?»á??á?´á??á?¬á??á?¼á??á?¹ GnuPG install á??á?¯á??á?¹á?»á??á?®á?¸á??á?¼á?¬á?¸á?»á??á?® á??á?á?¯á??á?½á?ºá??á?¹ \n"
-"    zip á??á?á?¯á??á?¹á??á?á?¯ á?»á??á??á?¹á?»á??á??á?¹á?»á??á?®á?¸á??á?¬á??á?²á?? á?±á?¡á?¬á??á?¹á??á?½á?¬á??á?²á?·á??á?á?¯á?? gpg commandline tool "
-"á??á?á?¯á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
+"    zip á??á?á?¯á??á?¹á??á?á?¯ á?»á??á??á?¹á?»á??á??á?¹á?»á??á?®á?¸á??á?¬á??á?²á?? á?±á?¡á?¬á??á?¹á??á?½á?¬á??á?²á?·á??á?á?¯á?? gpg commandline tool á??á?á?¯á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "    output á??á??á?¹ á?¡á??á??á?¹á?¸á??á??á?¹ á?¤á??á?²á?·á??á?á?¯á??  á?»á??á??á?¹á??á??á?¹á?·á??á??á?¹á??:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "    á?¡á??á??á?¹á?? á??á??á?¹á?·á?¡á?±á??á??á?½á??á?¹á?· commandline tools á?±á??á?¼á??á?²á?? á??á??á?¹á?¸á??á?½á?®á?¸á??á??á??á??á?½á?á??á?°á?¸á??á?á?¯á??á??á?¹ \n"
-"    á??á??á?¹á??á?¹á??á?á?¯á??á?¹á?±á??á??á??á?¼á??á?¹ GnuPG á?¡á??á?¼á??á?¹ graphical user interface á??á?á?¯ á?¾á??á?á?³á?¸á??á?¬á?¸ "
-"á??á?½á?¬á?±á??á?¼á?¾á??á??á?¹á?·á??á?«á?? :\n"
+"    á??á??á?¹á??á?¹á??á?á?¯á??á?¹á?±á??á??á??á?¼á??á?¹ GnuPG á?¡á??á?¼á??á?¹ graphical user interface á??á?á?¯ á?¾á??á?á?³á?¸á??á?¬á?¸ á??á?½á?¬á?±á??á?¼á?¾á??á??á?¹á?·á??á?«á?? :\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
-"     á?¡á??á??á?¹á?? Tor á??á?¼á??á?¹á??á??á?¹á??á?á?¯ á??á??á?¹á??á?¼á??á?¹á??á??á?¹ á??á??á?¹á?·á?¡á??á?¹á??á?¬á??á??á?¹á??á??á?¹á??á?¼á??á?¹á??á??á?? "
-"á??á?á??á?¹á??á?á?¯á??á??á?¬á?¸á??á??á?¹á??á?á?¯á??á??á?¹\n"
+"     á?¡á??á??á?¹á?? Tor á??á?¼á??á?¹á??á??á?¹á??á?á?¯ á??á??á?¹á??á?¼á??á?¹á??á??á?¹ á??á??á?¹á?·á?¡á??á?¹á??á?¬á??á??á?¹á??á??á?¹á??á?¼á??á?¹á??á??á?? á??á?á??á?¹á??á?á?¯á??á??á?¬á?¸á??á??á?¹á??á?á?¯á??á??á?¹\n"
 "     bridge relay á??á?á?¯á??á?á?¯á?¡á??á?¹á??á??á?¹ á?»á??á??á?¹á??á??á?¹á?? \n"
 "     Bridge realays (á??á?á?¯á??á??á??á?¯á??á?¹ á?¡á??á?á?¯á?±á??á?¬á??á?¹ \"bridges\") á??á?ºá?¬á?¸á??á??á?¹\n"
-"     á?¡á??á?á?? á??á??á?¹á?¸á??á??á??á?¹á??á?²á??á?¼á??á?¹ á??á??á?«á??á??á?¹á?±á??á?? á??á??á?á?¯á??á?? á?¡á??á?ºá?¬á?¸á??á?°á??á?«á??á?á?¯á??á?¹á??á?¬ á??á?¬á??á??á?¹á?¸á??á??á?¹ "
-"á??á?»á??á??á?¹á?·á??á?¶á?¯á??á?«á?? \n"
-"     á?¡á??á??á?¹á?? á??á??á?¹á?? ISP á?? á??á?á??á?á?¯á??á?¹á?±á??á?¬ Tor relays á??á?ºá?¬á?¸á??á?á?¯á?? á??á??á?¹á??á?¼á??á?¹á??á??á?±á??á?¼á??á?á?¯ "
-"á??á?®á??á??á?¹á??á?¬á?¸á??á??á?¹ á??á?á?¯á??á??á?¹á?±á??á?¬á??á?¹ \n"
+"     á?¡á??á?á?? á??á??á?¹á?¸á??á??á??á?¹á??á?²á??á?¼á??á?¹ á??á??á?«á??á??á?¹á?±á??á?? á??á??á?á?¯á??á?? á?¡á??á?ºá?¬á?¸á??á?°á??á?«á??á?á?¯á??á?¹á??á?¬ á??á?¬á??á??á?¹á?¸á??á??á?¹ á??á?»á??á??á?¹á?·á??á?¶á?¯á??á?«á?? \n"
+"     á?¡á??á??á?¹á?? á??á??á?¹á?? ISP á?? á??á?á??á?á?¯á??á?¹á?±á??á?¬ Tor relays á??á?ºá?¬á?¸á??á?á?¯á?? á??á??á?¹á??á?¼á??á?¹á??á??á?±á??á?¼á??á?á?¯ á??á?®á??á??á?¹á??á?¬á?¸á??á??á?¹ á??á?á?¯á??á??á?¹á?±á??á?¬á??á?¹ \n"
 "     bridge á?±á??á?¼á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á?á??á?¹á??á?á?¯á??á??á?á?¯á??á?¹á??á?á?¯á?? á??á?»á??á??á?¹á??á?¯á?á??á?¹á??á?«á??á?°á?¸á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
-"    á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?¬á??á?á?¯á??á?¹á??á?¼á??á?¹ \"get bridges\" á??á?¯á??á?«á??á??á?¹á?±á??á?¬ á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á?¯ á??á?á?¯á??á?? bridge "
-"á??á?á?¯á??á??á?°á??á?á?¯á??á?¹á??á?«á??á??á?¹á??\n"
+"    á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?¬á??á?á?¯á??á?¹á??á?¼á??á?¹ \"get bridges\" á??á?¯á??á?«á??á??á?¹á?±á??á?¬ á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á?¯ á??á?á?¯á??á?? bridge á??á?á?¯á??á??á?°á??á?á?¯á??á?¹á??á?«á??á??á?¹á??\n"
 "    á?±á?¡á?¬á??á?¹á?±á??á?¬á?¹á?»á??á??á?« á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á?¯ á??á?á?¯á??á?±á??á?¸á??á?«á??\n"
 "    bridges@xxxxxxxxxxxxxx\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "    á?±á?¡á?¬á??á?¹á?±á??á?¬á?¹á?»á??á??á?« á??á?á??á?¹á??á?¬á??á?¼á??á?¹á??á??á?¹á?¸ bridges á??á?ºá?¬á?¸á??á?á?¯ á??á??á?°á??á?á?¯á??á?¹á??á?«á?±á??á?¸á??á??á?¹á??\n"
@@ -579,34 +447,29 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    á?¡á?±á??á?¸á?¾á??á?®á?¸á?±á??á?¬á?¡á??á?ºá??á?¹á??á?½á?¬:\n"
 "    á??á??á?¹á?¸á??á??á?¹ á??á?á?¯á??á?¹á??á?ºá?¬á?¸ á?¡á??á?á?¯á??á?¹á?¸á??á?á?¯á??á?¹á??á?¼á?²á??á?á?¯á??á??á??á?¹ á?±á??á?¬á??á?¹á?¸á??á?á?¯á??á?? á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
 "    á??á??á?á?¯á??á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á?°á??á?®á?±á??á?¬ á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á?±á?¡á?¬á??á?¹á??á?¼á??á?¹ á??á?á??á?¹á?¸á??á?¬á?¸á?»á??á?®á?¸\n"
 "    á??á??á??á??á?¶á?¯á?¸á??á?á?¯á??á?¹á??á?á?¯ á??á??á??á?¹á??á??á?ºá??á?¹á??á?½á?á??á?¹á?? unpack á??á?»á??á?³á??á?¯á??á?¹á??á?½á?® \n"
-"    á?¡á??á?á?¯á??á?¹á?¸á??á?á?¯á??á?¹á??á?¼á?²á??á?á?¯á??á??á??á?¹á?· á??á?á?¯á??á?¹á??á?ºá?¬á?¸á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á??á?½á?á??á??á?¹ á?±á??á?¬á??á?¹á?·á??á?á?¯á?? "
-"á??á?á?¯á?¡á??á?¹á??á?«á??á??á?¹á??\n"
+"    á?¡á??á?á?¯á??á?¹á?¸á??á?á?¯á??á?¹á??á?¼á?²á??á?á?¯á??á??á??á?¹á?· á??á?á?¯á??á?¹á??á?ºá?¬á?¸á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?á?¯ á??á??á?½á?á??á??á?¹ á?±á??á?¬á??á?¹á?·á??á?á?¯á?? á??á?á?¯á?¡á??á?¹á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "    Packages á??á?ºá?¬á?¸á??á??á?¹ á?¡á??á?®á??á?¥á?¹á??á??á?º á??á?¼á??á?¹á??á?¬á??á?á??á?¹á?·á??á??á?¹á??\n"
@@ -614,59 +477,79 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
-"    á??á??á?¹á?? á?±á??á?¬á??á?¹á?¸á??á?á?¯á??á??á?¡á??á?¼á??á?¹ á?±á??á?ºá?¸á??á?°á?¸á??á??á?¹á??á?«á??á??á?¹á?? "
-"á?»á??á??á?¹á?·á??á?¯á?¶á??á?¼á?¬á??á?¬á?¸á??á??á?¹á??á?²á?·á?»á??á?®á?¸á?»á??á??á?¹á??á?«á??á??á?¹á?? \n"
+"    á??á??á?¹á?? á?±á??á?¬á??á?¹á?¸á??á?á?¯á??á??á?¡á??á?¼á??á?¹ á?±á??á?ºá?¸á??á?°á?¸á??á??á?¹á??á?«á??á??á?¹á?? á?»á??á??á?¹á?·á??á?¯á?¶á??á?¼á?¬á??á?¬á?¸á??á??á?¹á??á?²á?·á?»á??á?®á?¸á?»á??á??á?¹á??á?«á??á??á?¹á?? \n"
 "    á??á??á?¹á??á?±á??á?¬á??á?¹á?¸á??á?á?¯á??á??á??á??á?¹ á??á??á?¹á??á?±á??á?¬á??á?½á?¬ á??á?¯á??á?¹á?±á??á?¬á??á?¹á?±á??á??á?²á?»á??á??á?¹á??á?«á??á??á?¹á??\n"
 "    á??á??á?¹á?? package á??á?¬ á?±á??á?¬á??á?¹ á??á??á??á?á??á??á?¹á?¡á??á?¼á??á?¹á?¸ á?±á??á?¬á??á?¹á??á?½á?á??á?¬á??á??á?¹á?·á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
-"    á?¡á??á??á?¹á?? á?±á??á?¬á??á?¹á??á??á?¬á??á?·á?²á??á?°á?¸á??á?á?¯á??á??á?¹ package á??á?¬ á??á??á?¹á?·á?±á??á?¸á??á?¹á?¡á??á?¼á??á?¹ "
-"á?¡á??á?¼á??á?¹á??á?á?¯á??á?¹á??á?¹á?¾á??á?®á?¸á??á?¬á?¸á?±á??á??á?á?¯á?? á?»á??á??á?¹á??á?«á??á?á??á?¹á?·á??á??á?¹á??\n"
+"    á?¡á??á??á?¹á?? á?±á??á?¬á??á?¹á??á??á?¬á??á?·á?²á??á?°á?¸á??á?á?¯á??á??á?¹ package á??á?¬ á??á??á?¹á?·á?±á??á?¸á??á?¹á?¡á??á?¼á??á?¹ á?¡á??á?¼á??á?¹á??á?á?¯á??á?¹á??á?¹á?¾á??á?®á?¸á??á?¬á?¸á?±á??á??á?á?¯á?? á?»á??á??á?¹á??á?«á??á?á??á?¹á?·á??á??á?¹á??\n"
 "    gmail.com á??á?á?¯á??á??á??á?¯á??á?¹ yahoo.cn account á?»á??á??á?¹á?· á?»á??á??á?¹á??á?á?¯á??á?¾á??á??á?¹á?·á?±á??á?¸á??á?«á??\n"
 "    tor-im-browser-bundle á??á??á?¹ tor-browser-bundle á??á?á?¯ á?±á??á?¸á?¾á??á??á?¹á?·á??á?« \n"
 "    á??á?? á??á?á?¯á??á?á?¯á?±á??á?¸á??á??á?¹á??á?«á??á??á?¹á??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"   á??á?¶á??á?±á??á?¬á??á?¹á?¸á??á?¼á?¬á??á?² á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á??á?¡á?±á??á??á?²á?? á??á??á?¹á??á?±á??á?¬á??á?½á?¬ á?»á??á??á??á?¬á??á?ºá?¬á?¸á??á?²á?? "
-"á?±á??á?¼á??á?¾á??á?¶á?³á?±á??á??á?«á??á??á?¹á??\n"
-"   á??á??á?¹á?? á?±á??á?¬á??á?¹á?¸á??á?á?¯á??á??á??á?á?¯ á?¡á??á?¯á??á?ºá?á??á?¹á??á?½á?¬ á?»á??á??á?¹á?·á??á??á?¹á?¸á??á?±á??á?¸á??á?á?¯á??á?¹á?±á??á?¸á??á?«á??á?°á?¸á?? á?¤á??á?á??á?¥á??á?á?¯ "
-"á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á?? á?¾á??á?á?³á?¸á??á?¬á?¸á?±á?»á??á??á?½á??á?¹á?¸á?±á??á?¸á??á?½á?¬ á?»á??á??á?¹á??á?á?¯á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á?á??á?¹á??á?½á??á?¹á?±á??á?¸á??á?«á??\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
+msgstr ""
+"\n"
+"   á??á?¶á??á?±á??á?¬á??á?¹á?¸á??á?¼á?¬á??á?² á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á??á?¡á?±á??á??á?²á?? á??á??á?¹á??á?±á??á?¬á??á?½á?¬ á?»á??á??á??á?¬á??á?ºá?¬á?¸á??á?²á?? á?±á??á?¼á??á?¾á??á?¶á?³á?±á??á??á?«á??á??á?¹á??\n"
+"   á??á??á?¹á?? á?±á??á?¬á??á?¹á?¸á??á?á?¯á??á??á??á?á?¯ á?¡á??á?¯á??á?ºá?á??á?¹á??á?½á?¬ á?»á??á??á?¹á?·á??á??á?¹á?¸á??á?±á??á?¸á??á?á?¯á??á?¹á?±á??á?¸á??á?«á??á?°á?¸á?? á?¤á??á?á??á?¥á??á?á?¯ á??á?½á?¼á??á?¹á?±á??á?¬á?¹á??á?á?¯á?? "
+"á?¾á??á?á?³á?¸á??á?¬á?¸á?±á?»á??á??á?½á??á?¹á?¸á?±á??á?¸á??á?½á?¬ á?»á??á??á?¹á??á?á?¯á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á?á??á?¹á??á?½á??á?¹á?±á??á?¸á??á?«á??\n"
+"\n"
+"    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "     á??.) \".ex_RENAME\" á??á?½á??á?¹á?·á??á?¶á?¯á?¸á?±á??á?¬ á??á?á?¯á??á?¹á??á?á?¯ \".exe\" á??á?°á?? "
+#~ "á??á?¬á??á??á?¹á?»á??á??á?¹á?±á?»á??á?¬á??á?¹á?¸á?±á??á?¸á??á??á?½á?¬á?»á??á??á?¹á?»á??á?®á?¸\n"
+#~ "          \".ex_RENAME.asc\" á??á?½á??á?¹á?·á??á?¶á?¯á?¸á?±á??á?¬ á??á?á?¯á??á?¹á??á?á?¯á??á??á?¹á?¸ \".exe.asc\" á??á?°á?? "
+#~ "á??á?¬á??á??á?¹á?»á??á??á?¹á?±á?»á??á?¬á??á?¹á?¸á?±á??á?¸á??á??á?½á?¬á??á?«á??\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
diff --git a/i18n/bn/gettor.po b/i18n/bn/gettor.po
index df8f697..ecb29ba 100644
--- a/i18n/bn/gettor.po
+++ b/i18n/bn/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-08-30 17:58+0200\n"
 "Last-Translator: Rezwan <i_rezwan@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "à¦¹à§?à¦¯à¦¾à¦²à§?, à¦?à¦?à¦¿ \"à¦?à§?à¦?à¦?à¦°\" à¦°à¦¬à§?à¦?à¥¤ \n"
@@ -33,14 +31,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "à¦¦à§?à¦°à§?à¦à¦¾à¦?à§?à¦¯à¦?à¦¨à¦?à¦à¦¾à¦¬à§?, à¦?à¦®à¦°à¦¾ à¦?à¦? à¦ à¦¿à¦?à¦¾à¦¨à¦¾à§? à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦¤à§?à¦¤à¦° à¦¦à¦¿à¦¤à§? à¦ªà¦¾à¦°à¦¬ à¦¨à¦¾à¥¤ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦?à¦¿à§?\n"
@@ -49,14 +45,12 @@ msgstr ""
 "\n"
 " "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "à¦?à¦®à¦°à¦¾ à¦¶à§?à¦§à§? à¦¸à§?à¦?à¦¸à¦¬ à¦?à¦®à§?à¦?à¦² à¦¸à§?à¦¬à¦¾ à¦¥à§?à¦?à§? à¦?à¦¨à§?à¦°à§?à¦§ à¦ªà§?à¦°à¦?à§?à¦°à¦¿à§?à¦¾à¦?à¦¾à¦¤ à¦?à¦°à¦¿ à¦¯à§?à¦?à§?à¦²à§? \"à¦¡à¦¿à¦?à§?à¦?à§?à¦¾à¦?à¦?à¦®\" "
@@ -66,31 +60,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
-"(à¦?à¦®à¦°à¦¾ à¦¦à§?:à¦?à¦¿à¦¤ à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¿ à¦?à¦? à¦®à§?à¦?à¦²à§?à¦° à¦?à¦¨à§?à¦¯à§? à¦?à¦¨à§?à¦°à§?à¦§ à¦¨à¦¾ à¦?à¦°à§? à¦¥à¦¾à¦?à§?à¦¨à¥¤ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦?à¦²à¦?à¦¿ "
-"à¦?à¦?à¦?à¦¿\n"
-"à¦¸à§?à¦¬à¦¾ à¦¥à§?à¦?à§? à¦?à¦¸à§?à¦?à§? à¦¯à¦¾ \"à¦¡à¦¿à¦?à§?à¦?à§?à¦¾à¦?à¦?à¦®\" à¦ªà§?à¦°à¦¯à§?à¦?à§?à¦¤à¦¿ à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§? à¦¨à¦¾, à¦?à¦®à¦°à¦¾ à¦?à¦?à¦?à¦¿ à¦?à§?à¦? "
-"à¦¬à§?à¦¯à¦¾à¦?à§?à¦¯à¦¾ à¦ªà¦¾à¦ à¦¾à¦?à§?à¦?à¦¿,\n"
+"(à¦?à¦®à¦°à¦¾ à¦¦à§?:à¦?à¦¿à¦¤ à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¿ à¦?à¦? à¦®à§?à¦?à¦²à§?à¦° à¦?à¦¨à§?à¦¯à§? à¦?à¦¨à§?à¦°à§?à¦§ à¦¨à¦¾ à¦?à¦°à§? à¦¥à¦¾à¦?à§?à¦¨à¥¤ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦?à¦²à¦?à¦¿ à¦?à¦?à¦?à¦¿\n"
+"à¦¸à§?à¦¬à¦¾ à¦¥à§?à¦?à§? à¦?à¦¸à§?à¦?à§? à¦¯à¦¾ \"à¦¡à¦¿à¦?à§?à¦?à§?à¦¾à¦?à¦?à¦®\" à¦ªà§?à¦°à¦¯à§?à¦?à§?à¦¤à¦¿ à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§? à¦¨à¦¾, à¦?à¦®à¦°à¦¾ à¦?à¦?à¦?à¦¿ à¦?à§?à¦? à¦¬à§?à¦¯à¦¾à¦?à§?à¦¯à¦¾ "
+"à¦ªà¦¾à¦ à¦¾à¦?à§?à¦?à¦¿,\n"
 "à¦?à¦° à¦?à¦°à¦ªà¦°à§? à¦?à¦®à¦°à¦¾ à¦?à¦? à¦?à¦®à§?à¦?à¦² à¦ à¦¿à¦?à¦¾à¦¨à¦¾à¦?à¦¿ à¦?à§?à¦¿à§?à§? à¦¯à¦¾à¦¬à¥¤)\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "à¦?à¦¨à§?à¦?à§?à¦°à¦¹ à¦?à¦°à§? à¦?à§?à§?à¦¾à¦² à¦?à¦°à¦¬à§?à¦¨ à¦¯à§? à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦?à¦®à¦°à¦¾ à¦?à¦?à¦?à¦?à¦¿à¦?à¦®à¦?à¦² à¦?à¦®à§?à¦?à¦² à¦?à¦¥à¦¬à¦¾ à¦¬à§?à¦?à¦? à§¬à§ª à¦?à¦®à§?à¦?à¦²\n"
@@ -98,28 +87,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
-"à¦?à¦ªà¦¨à¦¾à¦° à¦¯à¦¦à¦¿ à¦?à§?à¦¨ à¦ªà§?à¦°à¦¶à§?à¦¨ à¦¥à¦¾à¦?à§? à¦?à¦¥à¦¬à¦¾ à¦?à¦?à¦¿ à¦?à¦¾à¦? à¦¨à¦¾ à¦?à¦°à§?, à¦?à¦ªà¦¨à¦¾à¦°à¦¾ à¦?à§?à¦¨ à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯à¦?à¦¾à¦°à§? "
-"à¦¬à§?à¦¯à¦?à§?à¦¤à¦¿à¦?à§?\n"
+"à¦?à¦ªà¦¨à¦¾à¦° à¦¯à¦¦à¦¿ à¦?à§?à¦¨ à¦ªà§?à¦°à¦¶à§?à¦¨ à¦¥à¦¾à¦?à§? à¦?à¦¥à¦¬à¦¾ à¦?à¦?à¦¿ à¦?à¦¾à¦? à¦¨à¦¾ à¦?à¦°à§?, à¦?à¦ªà¦¨à¦¾à¦°à¦¾ à¦?à§?à¦¨ à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯à¦?à¦¾à¦°à§? à¦¬à§?à¦¯à¦?à§?à¦¤à¦¿à¦?à§?\n"
 "à¦?à¦? à¦¸à¦¹à¦¾à§?à¦? à¦?à¦®à§?à¦?à¦² à¦ à¦¿à¦?à¦¾à¦¨à¦¾à§? à¦®à§?à¦?à¦² à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à§?à¦¨: tor-assistants@xxxxxxxxxxxxxx\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "à¦?à¦®à¦¿ à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦?à¦?à¦¿ à¦?à¦° à¦ªà§?à¦¯à¦¾à¦?à§?à¦? à¦ªà¦¾à¦ à¦¾à¦¬, à¦¯à¦¦à¦¿ à¦?à¦ªà¦¨à¦¿ à¦¬à¦²à¦¤à§? à¦ªà¦¾à¦°à§?à¦¨ à¦¯à§? à¦ à¦¿à¦? à¦?à§?à¦¨à¦?à¦¿ à¦?à¦ªà¦¨à¦¿ à¦?à¦¾à¦¨à¥¤\n"
@@ -127,13 +111,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "à¦?à¦¨à§?à¦?à§?à¦°à¦¹ à¦?à¦°à§? à¦?à¦? à¦ à¦¿à¦?à¦¾à¦¨à¦¾à§? à¦?à¦¬à¦¾à¦¬ à¦ªà¦¾à¦ à¦¾à¦¨ (à¦ªà§?à¦°à¦¤à¦¿ gettor@xxxxxxxxxxxxxx), à¦?à¦¬à¦? à¦?à¦®à¦¾à¦?à§? "
@@ -142,23 +124,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "à¦?à¦°à§?à¦° à¦?à¦¨à§?à¦¬à¦¾à¦¦à¦¿à¦¤ à¦¸à¦?à¦¸à§?à¦?à¦°à¦£à¦?à§?à¦²à§? à¦ªà¦¾à¦?à§?à¦¾à¦° à¦?à¦ªà¦¾à§?\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "à¦?à¦ªà¦¨à¦¾à¦° à¦ªà¦?à¦¨à§?à¦¦à§?à¦° à¦à¦¾à¦·à¦¾à§? à¦?à¦¨à§?à¦¬à¦¾à¦¦ à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯à§? à¦?à¦°à§?à¦° à¦?à¦?à¦?à¦¿ à¦¸à¦?à¦¸à§?à¦?à¦°à¦£ à¦¨à¦¿à¦°à§?à¦¦à¦¿à¦·à§?à¦? à¦?à¦°à§?à¦¨\n"
@@ -166,14 +144,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "à¦?à¦? à¦?à¦¦à¦¾à¦¹à¦°à¦£à¦?à¦¿à¦° à¦®à¦¤ à¦?à¦¾à¦? à¦?à¦°à¦²à§? à¦?à¦ªà¦¨à¦¾à¦?à§? à¦ªà¦¾à¦ à¦¾à¦¬à§? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦°à§?à¦§à¦?à§?à¦¤ à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à¦?à¦¿à¦°\n"
@@ -183,31 +159,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "à¦?à¦®à¦°à¦¾ à¦¯à§?à¦¸à¦¬ à¦à¦¾à¦·à¦¾à§? à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à¦?à¦¿ à¦¦à¦¿à§?à§? à¦¥à¦¾à¦?à¦¿:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "à¦?à¦?à¦¾à¦¨à§? à¦¸à¦¹à¦?à¦²à¦à§?à¦¯ à¦¸à¦¬ à¦à¦¾à¦·à¦¾à¦° à¦¤à¦¾à¦²à¦¿à¦?à¦¾ à¦¦à§?à§?à¦¾ à¦?à¦?à§?:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -218,9 +189,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: à¦?à¦°à¦¬à§?\n"
@@ -237,38 +206,30 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
-"à¦?à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦?à§?à¦¨ à¦à¦¾à¦·à¦¾ à¦¨à¦¾ à¦ªà¦?à¦¨à§?à¦¦ à¦?à¦°à§? à¦¥à¦¾à¦?à§?à¦¨, à¦¤à¦¾à¦¹à¦²à§? à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦?à¦°à§?à¦?à§? à¦¸à¦?à¦¸à§?à¦?à¦°à¦£ à¦ªà¦¾à¦ à¦¾à¦¨à§? "
-"à¦¹à¦¬à§?à¥¤\n"
+"à¦?à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦?à§?à¦¨ à¦à¦¾à¦·à¦¾ à¦¨à¦¾ à¦ªà¦?à¦¨à§?à¦¦ à¦?à¦°à§? à¦¥à¦¾à¦?à§?à¦¨, à¦¤à¦¾à¦¹à¦²à§? à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦?à¦°à§?à¦?à§? à¦¸à¦?à¦¸à§?à¦?à¦°à¦£ à¦ªà¦¾à¦ à¦¾à¦¨à§? à¦¹à¦¬à§?à¥¤\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "à¦?à§?à¦? à¦¸à¦¾à¦?à¦?à§?à¦° à¦ªà§?à¦¯à¦¾à¦?à§?à¦?\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "à¦?à¦ªà¦¨à¦¾à¦° à¦¬à§?à¦¯à¦¾à¦¨à§?à¦¡à¦?à¦?à¦¦à¦¥ (à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦?à§?à¦° à¦?à¦¤à¦¿) à¦¯à¦¦à¦¿ à¦?à¦® à¦¥à¦¾à¦?à§? à¦?à¦¥à¦¬à¦¾ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦?à¦?à¦¸à¦ªà¦¿ à¦?à¦ªà¦¨à¦¾à¦?à§?\n"
@@ -279,36 +240,30 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "à¦¶à§?à¦§à§?à¦®à¦¾à¦¤à§?à¦° 'split' (à¦¸à§?à¦ªà§?à¦²à¦¿à¦?) à¦?à¦? à¦?à¦¿à¦?à§?à¦¾à¦°à§?à¦¡à¦?à¦¿ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦?à¦²à§? à¦¯à§?à¦? à¦?à¦°à§? à¦¦à¦¿à¦¨ à¦?à¦à¦¾à¦¬à§?:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "à¦?à¦? à¦?à§?à¦?à§?à¦¸à¦? à¦¬à¦¾à¦°à§?à¦¤à¦¾à¦?à¦¿ à¦?à¦?à¦?à¦¿ à¦?à¦®à§?à¦?à¦²à§?à¦° à¦®à¦¾à¦§à§?à¦¯à¦®à§? à¦?à§?à¦?à¦?à¦°à§?à¦° à¦?à¦¾à¦?à§? à¦ªà¦¾à¦ à¦¾à¦²à§?\n"
 "à¦?à¦?à¦¿ à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¬à¦¾à¦¨à§?à¦¡à§?à¦² à§§.à§ª à¦®à§?à¦?à¦¾à¦¬à¦¾à¦?à¦?à§?à¦° à¦¸à¦?à¦¯à§?à¦?à§?à¦¤à¦¿à¦° à¦?à¦?à¦¾à¦°à§? à¦ªà¦¾à¦ à¦¾à¦¬à§?à¥¤\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "à¦¸à¦¬ à¦?à¦?à¦¿ à¦?à¦?à¦¶ à¦ªà¦¾à¦¬à¦¾à¦° à¦ªà¦°à§? à¦?à¦ªà¦¨à¦¾à¦?à§? à¦¸à§?à¦?à§?à¦²à§?à¦?à§? à¦ªà§?à¦¨à¦°à¦¾à§? à¦?à¦?à¦¤à§?à¦° à¦?à¦°à¦¤à§? à¦¹à¦¬à§?\n"
@@ -316,56 +271,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "à§§) à¦?à¦ªà¦¨à¦¾à¦° à¦¹à¦¾à¦°à§?à¦¡à¦¡à¦¿à¦¸à§?à¦?à§?à¦° à¦?à¦?à¦?à¦¿ à¦«à§?à¦²à§?à¦¡à¦¾à¦°à§? à¦¸à¦¬ à¦?à§?à¦¯à¦¾à¦?à¦¾à¦?à¦®à§?à¦¨à§?à¦?à¦?à§?à¦²à§? à¦¸à§?à¦ à¦?à¦°à§? à¦°à¦¾à¦?à§?à¦¨à¥¤\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"à§¨) à¦¯à§?à¦¸à¦¬ à¦«à¦¾à¦?à¦²à§?à¦° à¦¶à§?à¦·à§? \".z\" à¦?à¦?à§? à¦¸à§?à¦?à§?à¦²à§?à¦?à§? à¦?à¦¨à¦?à¦¿à¦ª à¦?à¦°à§?à¦¨à¥¤ à¦?à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦¸à¦¬ à¦?à§?à¦¯à¦?à¦¾à¦?à¦®à§?à¦¨à§?à¦? "
-"à¦¸à§?à¦?à¦ à¦?à¦°à§? à¦°à¦¾à¦?à§?à¦¨\n"
+"à§¨) à¦¯à§?à¦¸à¦¬ à¦«à¦¾à¦?à¦²à§?à¦° à¦¶à§?à¦·à§? \".z\" à¦?à¦?à§? à¦¸à§?à¦?à§?à¦²à§?à¦?à§? à¦?à¦¨à¦?à¦¿à¦ª à¦?à¦°à§?à¦¨à¥¤ à¦?à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦¸à¦¬ à¦?à§?à¦¯à¦?à¦¾à¦?à¦®à§?à¦¨à§?à¦? à¦¸à§?à¦?à¦ "
+"à¦?à¦°à§? à¦°à¦¾à¦?à§?à¦¨\n"
 "à¦?à¦?à¦?à¦¿ à¦¨à¦¤à§?à¦¨ à¦«à§?à¦²à§?à¦¡à¦¾à¦°à§?, à¦¸à§?à¦? à¦«à§?à¦²à§?à¦¡à¦¾à¦°à§?à¦? à¦¸à¦¬ à¦«à¦¾à¦?à¦² à¦?à¦¨à¦?à¦¿à¦ª à¦?à¦°à§?à¦¨à¥¤\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"à§©) \".ex_RENAME\" à¦¸à¦®à§?à¦¬à¦²à¦¿à¦¤ à¦«à¦¾à¦?à¦²à§?à¦° à¦¶à§?à¦·à¦¾à¦?à¦¶à§?à¦° à¦¨à¦¾à¦® à¦¬à¦¦à¦²à§? \".exe\" à¦?à¦°à§?à¦¨ à¦?à¦¬à¦?\n"
-"à¦?à¦°à¦? à¦¬à¦¦à¦² à¦?à¦°à§?à¦¨ \".ex_RENAME.asc\" à¦?à¦? à¦?à¦?à¦¶à¦?à§?à¦²à§?à¦?à§? à¦?à¦? à¦«à¦¾à¦?à¦² à¦?à¦?à§?à¦¸à¦?à§?à¦¨à¦¶à¦¨à§?à¦° à¦®à¦¾à¦§à§?à¦¯à¦®à§? -\n"
-"\".exe.asc\"\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "à§ª) à¦®à¦¿à¦²à¦¿à§?à§? à¦¦à§?à¦?à§?à¦¨ à¦®à§?à¦?à¦²à§? à¦¯à§?à¦®à¦¨ à¦¬à¦²à¦¾ à¦?à¦?à§? à¦¤à¦¾à¦° à¦¸à¦¾à¦¥à§? à¦¯à§? à¦«à¦¾à¦?à¦²à¦?à§?à¦²à§? à¦ªà§?à§?à§?à¦?à§?à¦¨ \n"
@@ -373,43 +305,36 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
-"à§«) à¦?à¦?à¦¨ à¦?à¦?à¦?à¦¿ à¦ªà§?à¦°à§?à¦?à§?à¦°à¦¾à¦® à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§?à¦¨ à¦¯à¦¾ à¦°à¦¾à¦° à¦?à¦°à§?à¦?à¦¾à¦?à¦ à¦¥à§?à¦?à§? à¦«à¦¾à¦?à¦²à¦?à§?à¦²à§?à¦?à§? "
-"à¦¸à¦®à§?à¦ªà§?à¦°à¦¸à¦¾à¦°à¦¿à¦¤ à¦?à¦°à¦¤à§? à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯ à¦?à¦°à¦¬à§?à¥¤\n"
+"à§«) à¦?à¦?à¦¨ à¦?à¦?à¦?à¦¿ à¦ªà§?à¦°à§?à¦?à§?à¦°à¦¾à¦® à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§?à¦¨ à¦¯à¦¾ à¦°à¦¾à¦° à¦?à¦°à§?à¦?à¦¾à¦?à¦ à¦¥à§?à¦?à§? à¦«à¦¾à¦?à¦²à¦?à§?à¦²à§?à¦?à§? à¦¸à¦®à§?à¦ªà§?à¦°à¦¸à¦¾à¦°à¦¿à¦¤ à¦?à¦°à¦¤à§? "
+"à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯ à¦?à¦°à¦¬à§?à¥¤\n"
 "à¦?à¦?à¦¨à§?à¦¡à§?à¦?à§? à¦?à¦?à¦¿à¦° à¦¨à¦¾à¦® à¦¸à¦¾à¦§à¦¾à¦°à¦£à¦¤ à¦?à¦?à¦¨à¦°à¦¾à¦°à¥¤ à¦?à¦ªà¦¨à¦¾à¦° à¦¯à¦¦à¦¿ à¦¤à¦¾ à¦¨à¦¾ à¦¥à¦¾à¦?à§?\n"
 "à¦?à¦¨à¦¸à§?à¦?à¦² à¦?à¦°à¦¾ à¦¤à¦¾à¦¹à¦²à§? à¦¤à¦¾ à¦?à¦?à¦¾à¦¨ à¦¥à§?à¦?à§? à¦¡à¦¾à¦?à¦¨à¦²à§?à¦¡ à¦?à¦°à§?à¦¨:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦° à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à¦?à¦¿ à¦?à§?à¦²à¦¾à¦° à¦?à¦¨à§?à¦¯à§? à¦¶à§?à¦§à§? \".exe\" à¦«à¦¾à¦?à¦²à¦?à¦¿ à¦¡à¦¾à¦¬à¦²à¦?à§?à¦²à¦¿à¦? à¦?à¦°à§?à¦¨à¥¤\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "à§¬) à¦ªà§?à¦¯à¦¾à¦?à§?à¦? à¦?à§?à¦²à¦¾ à¦¶à§?à¦· à¦¹à¦²à§? à¦?à¦ªà¦¨à¦¿ à¦?à¦?à¦?à¦¿ à¦¨à¦¤à§?à¦¨ à¦?à§?à¦²à¦¾\n"
@@ -418,50 +343,37 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "à§) à¦?à¦? à¦¤à§?! à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¾à¦? à¦¶à§?à¦·à¥¤ à¦§à¦¨à§?à¦¯à¦¬à¦¾à¦¦ à¦?à¦° à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦°à§?à¦° à¦?à¦¨à§?à¦¯à§? à¦?à¦¬à¦? à¦?à¦ªà¦à§?à¦? à¦?à¦°à§?à¦¨!\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"à¦¸à¦¹à¦¾à§?à¦¤à¦¾\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
-"à¦?à¦?à¦¾à¦¨à§? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦?à¦¾à¦?à§?à¦?à¦¿à¦¤ à¦¸à¦«à§?à¦?à¦?à§?à§?à¦¯à¦¾à¦°à¦?à¦¿ à¦°à§?à§?à¦?à§? à¦?à¦?à¦?à¦¿ à¦?à¦¿à¦ª à¦«à¦¾à¦?à¦² à¦¹à¦¿à¦¸à§?à¦¬à§?à¥¤ à¦?à¦¨à§?à¦?à§?à¦°à¦¹ à¦?à¦°à§? "
-"à¦?à¦¨à¦?à¦¿à¦ª à¦?à¦°à§?à¦¨\n"
+"à¦?à¦?à¦¾à¦¨à§? à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦?à¦¾à¦?à§?à¦?à¦¿à¦¤ à¦¸à¦«à§?à¦?à¦?à§?à§?à¦¯à¦¾à¦°à¦?à¦¿ à¦°à§?à§?à¦?à§? à¦?à¦?à¦?à¦¿ à¦?à¦¿à¦ª à¦«à¦¾à¦?à¦² à¦¹à¦¿à¦¸à§?à¦¬à§?à¥¤ à¦?à¦¨à§?à¦?à§?à¦°à¦¹ à¦?à¦°à§? à¦?à¦¨à¦?à¦¿à¦ª "
+"à¦?à¦°à§?à¦¨\n"
 "à¦?à¦? à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à¦?à¦¿ à¦?à¦¬à¦? à¦¸à¦¿à¦?à¦¨à§?à¦?à¦¾à¦°à¦?à¦¿ à¦¸à¦¤à§?à¦¯à¦¾à§?à¦¿à¦¤ à¦?à¦°à§?à¦¨à¥¤\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "à¦?à¦?à§?à¦?à¦¿à¦¤: à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦®à§?à¦ªà¦¿à¦?à¦?à¦¾à¦°à§? à¦¯à¦¦à¦¿ à¦?à¦¿à¦?à¦¨à¦?à¦?à¦ªà¦¿à¦?à¦¿ à¦?à¦¨à¦¸à§?à¦?à¦² à¦?à¦°à¦¾ à¦¥à¦¾à¦?à§?, à¦¤à¦¾à¦¹à¦²à§? à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§?à¦¨ "
@@ -470,37 +382,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --verify <à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à§?à¦° à¦¨à¦¾à¦®>.asc <à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à§?à¦° à¦¨à¦¾à¦®>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "à¦?à¦° à¦?à¦?à¦?à¦ªà§?à¦?à¦?à¦¿ à¦?à¦°à¦?à¦® à¦¦à§?à¦?à¦¾à¦¬à§? à¦¹à§?à¦¤:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "à¦?à¦ªà¦¨à¦¾à¦° à¦¯à¦¦à¦¿ à¦?à¦®à¦¾à¦¨à§?à¦¡à¦²à¦¾à¦?à¦¨ à¦?à§?à¦² à¦¸à¦®à§?à¦ªà¦°à§?à¦?à§? à¦?à¦¾à¦¨à¦¾ à¦¨à¦¾ à¦¥à¦¾à¦?à§? à¦¤à¦¾à¦¹à¦²à§? à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨ à¦?à§?à¦?à¦?à¦¤à§?\n"
@@ -508,17 +403,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦?à¦¾à¦°à¦¨à§?à¦? à¦?à¦¾à¦¨à§?à¦?à¦¶à¦¨ à¦¯à¦¦à¦¿ à¦?à¦° à¦¨à§?à¦?à¦?à§?à¦¾à¦°à§?à¦?à¦?à§? à¦¬à§?à¦²à¦? à¦?à¦°à§?, à¦?à¦ªà¦¨à¦¾à¦°\n"
@@ -530,32 +423,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
-"à¦?à¦ªà¦¨à¦¿ à¦?à¦?à¦?à¦¿ à¦¬à§?à¦°à¦¿à¦?à¦?à§? à¦?à¦§à¦¿à¦?à§?à¦°à¦¹à¦£ à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à¦¬à§?à¦¨ à¦?à¦?à¦?à¦¿ à¦?à¦®à§?à¦?à¦² à¦ªà¦¾à¦ à¦¿à§?à§? à¦¯à¦¾à¦¤à§? à¦²à§?à¦?à¦¾ à¦¥à¦¾à¦?à¦¬à§? "
-"\"get bridges\" (à¦?à§?à¦? à¦¬à§?à¦°à¦¿à¦?à§?à¦¸)\n"
+"à¦?à¦ªà¦¨à¦¿ à¦?à¦?à¦?à¦¿ à¦¬à§?à¦°à¦¿à¦?à¦?à§? à¦?à¦§à¦¿à¦?à§?à¦°à¦¹à¦£ à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à¦¬à§?à¦¨ à¦?à¦?à¦?à¦¿ à¦?à¦®à§?à¦?à¦² à¦ªà¦¾à¦ à¦¿à§?à§? à¦¯à¦¾à¦¤à§? à¦²à§?à¦?à¦¾ à¦¥à¦¾à¦?à¦¬à§? \"get "
+"bridges\" (à¦?à§?à¦? à¦¬à§?à¦°à¦¿à¦?à§?à¦¸)\n"
 "à¦¸à§?à¦? à¦®à§?à¦?à¦²à§?à¦° à¦®à§?à¦² à¦?à¦?à¦¶à§? à¦¯à¦¾ à¦?à¦? à¦ à¦¿à¦?à¦¾à¦¨à¦¾à§? à¦ªà¦¾à¦ à¦¾à¦¨à§? à¦¹à¦¬à§?:\n"
 "bridges@xxxxxxxxxxxxxx\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "à¦?à§?à§?à¦¬ à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¬à§?à¦¯à¦¬à¦¹à¦¾à¦° à¦?à¦°à§?à¦? à¦¸à¦®à§?à¦à¦¬ à¦¬à§?à¦°à¦¿à¦? à¦?à¦¨à¦¾ - à¦?à¦? à¦?à¦?à¦?à¦°à¦?à¦² à¦? à¦¯à§?à¦¤à§? à¦¹à¦¬à§?\n"
@@ -563,16 +449,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "à¦?à§?à¦°à§?à¦¤à§?à¦¬à¦ªà§?à¦°à§?à¦£ à¦¤à¦¥à§?à¦¯:\n"
@@ -583,13 +467,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à¦?à§?à¦²à§? à¦?à¦¾à¦? à¦¨à¦¾à¦? à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à§?! à¦?à¦¨à§?à¦?à§?à¦°à¦¹ à¦?à¦°à§? à¦¦à§?à¦?à§?à¦¨ à¦?à¦ªà¦¨à¦¿ à¦ªà§?à§?à§?à¦?à§?à¦¨ à¦?à¦¿ à¦¨à¦¾\n"
@@ -597,16 +479,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "à¦§à¦¨à§?à¦¯à¦¬à¦¾à¦¦ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦°à§?à¦§à§?à¦° à¦?à¦¨à§?à¦¯à§?à¥¤ à¦?à¦?à¦¿ à¦à¦¾à¦²à¦à¦¾à¦¬à§? à¦¬à§?à¦?à¦¾ à¦?à§?à¦?à§?à¥¤ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¨à§?à¦°à§?à¦§\n"
@@ -615,39 +493,64 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "à¦?à¦?à¦¿ à¦¯à¦¦à¦¿ à¦¨à¦¾ à¦?à¦¸à§?, à¦?à¦? à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à¦?à¦¿ à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦?à¦?à¦¸à¦ªà¦¿à¦° à¦?à¦¨à§?à¦¯à§? à¦?à§?à¦¬ à¦¬à§? à¦¹à§?à§? à¦?à§?à¦?à§?à¥¤\n"
 "à¦®à§?à¦?à¦²à¦?à¦¿ à¦?à¦¿à¦®à§?à¦?à¦².à¦?à¦® à¦¬à¦¾ à¦?à§?à¦¾à¦¹à§?.à¦¸à¦¿à¦?à¦¨ à¦?à¦° à¦?à¦?à¦?à¦¿ à¦?à§?à¦¯à¦¾à¦?à¦¾à¦?à¦¨à§?à¦? à¦¥à§?à¦?à§? à¦ªà¦¾à¦ à¦¾à¦¨à§?à¦° à¦?à§?à¦·à§?à¦?à¦¾ à¦?à¦°à§?à¦¨\n"
-"à¦?à¦ªà¦¨à¦¿ à¦?à¦° à¦?à¦® à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¬à¦¾à¦¨à§?à¦¡à§?à¦²à§?à¦° à¦ªà¦°à¦¿à¦¬à¦°à§?à¦¤à§? à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¬à¦¾à¦¨à§?à¦¡à§?à¦² à¦ªà¦¾à¦¬à¦¾à¦° à¦?à¦¨à§?à¦¯à§? "
-"à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨,\n"
+"à¦?à¦ªà¦¨à¦¿ à¦?à¦° à¦?à¦® à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¬à¦¾à¦¨à§?à¦¡à§?à¦²à§?à¦° à¦ªà¦°à¦¿à¦¬à¦°à§?à¦¤à§? à¦?à¦° à¦¬à§?à¦°à¦¾à¦?à¦?à¦¾à¦° à¦¬à¦¾à¦¨à§?à¦¡à§?à¦² à¦ªà¦¾à¦¬à¦¾à¦° à¦?à¦¨à§?à¦¯à§? à¦?à¦¨à§?à¦°à§?à¦§ à¦?à¦°à§?à¦¨,\n"
 "à¦?à¦¾à¦°à¦¨ à¦?à¦?à¦¿ à¦¸à¦¾à¦?à¦?à§? à¦?à§?à¦?à¥¤\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "à¦¦à§?:à¦?à¦¿à¦¤ à¦?à¦®à¦°à¦¾ à¦?à¦?à¦¨ à¦¸à¦®à¦¸à§?à¦¯à¦¾à¦° à¦®à¦§à§?à¦¯à§? à¦¦à¦¿à§?à§? à¦¯à¦¾à¦?à§?à¦?à¦¿ à¦?à¦¬à¦? à¦?à¦ªà¦¨à¦¾à¦°à¥¤\n"
-"à¦?à¦¨à§?à¦°à§?à¦§ à¦°à¦?à§?à¦·à¦¾ à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à¦?à¦¿ à¦¨à¦¾à¥¤ à¦?à¦¨à§?à¦?à§?à¦°à¦¹ à¦?à¦°à§? à¦§à§?à¦°à§?à¦¯ à¦§à¦°à§?à¦¨ à¦¯à¦¤à¦?à§?à¦·à¦£ à¦¨à¦¾ à¦?à¦®à¦°à¦¾ à¦?à¦? à¦¸à¦®à¦¸à§?à¦¯à¦¾à¦° "
-"à¦¸à¦®à¦¾à¦§à¦¾à¦¨ à¦?à¦°à¦¿à¥¤\n"
-"\n"
-"    "
+"à¦?à¦¨à§?à¦°à§?à¦§ à¦°à¦?à§?à¦·à¦¾ à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à¦?à¦¿ à¦¨à¦¾à¥¤ à¦?à¦¨à§?à¦?à§?à¦°à¦¹ à¦?à¦°à§? à¦§à§?à¦°à§?à¦¯ à¦§à¦°à§?à¦¨ à¦¯à¦¤à¦?à§?à¦·à¦£ à¦¨à¦¾ à¦?à¦®à¦°à¦¾ à¦?à¦? à¦¸à¦®à¦¸à§?à¦¯à¦¾à¦° à¦¸à¦®à¦¾à¦§à¦¾à¦¨ "
+"à¦?à¦°à¦¿à¥¤\n"
+"\n"
+"    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "à§©) \".ex_RENAME\" à¦¸à¦®à§?à¦¬à¦²à¦¿à¦¤ à¦«à¦¾à¦?à¦²à§?à¦° à¦¶à§?à¦·à¦¾à¦?à¦¶à§?à¦° à¦¨à¦¾à¦® à¦¬à¦¦à¦²à§? \".exe\" à¦?à¦°à§?à¦¨ à¦?à¦¬à¦?\n"
+#~ "à¦?à¦°à¦? à¦¬à¦¦à¦² à¦?à¦°à§?à¦¨ \".ex_RENAME.asc\" à¦?à¦? à¦?à¦?à¦¶à¦?à§?à¦²à§?à¦?à§? à¦?à¦? à¦«à¦¾à¦?à¦² à¦?à¦?à§?à¦¸à¦?à§?à¦¨à¦¶à¦¨à§?à¦° à¦®à¦¾à¦§à§?à¦¯à¦®à§? -\n"
+#~ "\".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "à¦¸à¦¹à¦¾à§?à¦¤à¦¾\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --verify <à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à§?à¦° à¦¨à¦¾à¦®>.asc <à¦ªà§?à¦¯à¦¾à¦?à§?à¦?à§?à¦° à¦¨à¦¾à¦®>\n"
+#~ "\n"
+#~ "    "
diff --git a/i18n/bn_IN/gettor.po b/i18n/bn_IN/gettor.po
index e7e6736..a711308 100644
--- a/i18n/bn_IN/gettor.po
+++ b/i18n/bn_IN/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/bo/gettor.po b/i18n/bo/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/bo/gettor.po
+++ b/i18n/bo/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/br/gettor.po b/i18n/br/gettor.po
index e7e6736..a711308 100644
--- a/i18n/br/gettor.po
+++ b/i18n/br/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/bs/gettor.po b/i18n/bs/gettor.po
index e7e6736..a711308 100644
--- a/i18n/bs/gettor.po
+++ b/i18n/bs/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ca/gettor.po b/i18n/ca/gettor.po
index 6ca7e7f..1c19c5c 100644
--- a/i18n/ca/gettor.po
+++ b/i18n/ca/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-08-10 11:40+0200\n"
 "Last-Translator: lluismas <lluis.mas.sariola@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Hola, AixÃ² es el robot \"GetTor\".\n"
@@ -33,46 +31,42 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
-"Desafortunadament no et podem respondre en aquesta adreÃ§a. Tens de crear un \n"
+"Desafortunadament no et podem respondre en aquesta adreÃ§a. Tens de crear "
+"un \n"
 "compte amb GMAIL.COM o YAHOO.CN i enviar un E-mail desde \n"
 "un d'aquests comptes.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "Tant sols procesem peticions de email que suportin \"DKIM\",\n"
-"que es una opcio que ens permet verificar que la adreÃ§a desde el camp \"From\"\n"
+"que es una opcio que ens permet verificar que la adreÃ§a desde el camp \"From"
+"\"\n"
 "es la que actualment esta enviant el missatge.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(Ho sentim molt si no has demanat aquest mail. Com que el teu mail \n"
@@ -81,27 +75,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
-"Siusplau, pren nota que normalment no procesem emails HTML o emails base 64.\n"
+"Siusplau, pren nota que normalment no procesem emails HTML o emails base "
+"64.\n"
 "Et suggerim enviar emails de texte.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Si tens dubtes o problemes, pots contactar amb\n"
@@ -109,13 +100,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "T'enviarem el pack Tor, si ens indiques quin vols.\n"
@@ -123,13 +112,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Siusplau respon a aquest email (to gettor@xxxxxxxxxxxxxx), indicant\n"
@@ -137,23 +124,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "OBTENINT VERSIONS LOCALITZADES DE TOR\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Per obtenir una versiÃ³ de Tor en la teva llengua, especifica \n"
@@ -161,14 +144,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "Aquest exemple t'ofereix el pack solicitat per a una versiÃ³ \n"
@@ -176,31 +157,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Llista de locals suportades:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "AixÃ² es una llista d'idiomes disponibles:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -211,9 +187,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: Arabic\n"
@@ -230,37 +204,30 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "Si no en selecciones cap, rebras la versiÃ² en AnglÃ¨s.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "PAQUETS DE MIDA REDUÃ?DA\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "Si el teu ample de banda es baix o el teu proveidor no et permet \n"
@@ -270,23 +237,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "Sencillament inclou la paraula 'split' en algÃºn lloc del teu email:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "Enviant aquest texte en un email a GetTor rebrÃ¡s \n"
@@ -294,13 +257,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "Un cop hagis rebut totes les parts, tens de reconstruir-ho tot \n"
@@ -308,56 +269,34 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "1.) Desa tots els adjunts rebuts dins una carpeta al teu disc.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"2.) Descomprimeix tots els arxius acabats en \".z\".Si anteriorment has desat \n"
+"2.) Descomprimeix tots els arxius acabats en \".z\".Si anteriorment has "
+"desat \n"
 "tots els adjunts en una carpeta nova, sencillament descomprimeix tots els "
 "arxius de la carpeta.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3.) Renomena l'arxiu acabat en \".ex_RENAME\" en un \".exe\" i tambÃ© \n"
-"l'arxiu acabat en \".ex_RENAME.asc\" en\n"
-"\".exe.asc\"\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "4.) Verifica la existencia de tots els arxius descrits en el mail \n"
@@ -365,14 +304,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "5.)Utilitza una aplicaciÃ³ que pugui descomprimir arxius RAR multivolum. A \n"
@@ -381,26 +318,21 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "Per desenpaquetar, sencillament fes doble clic al arxiu \".exe\" .\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "6.) Quan finalitzi el desenpaquetat, trobarÃ¡s un nou arxiu  \n"
@@ -409,35 +341,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "7.) AixÃ³ es tot. Ja ho tens. Gracies per utilitzar Tor, i pasa-ho be.!\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"SUPORT\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "Aqui tens el software que has demanat en un arxiu ZIP. Siusplau, "
@@ -446,13 +367,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "Nota: Si el teu ordinador te GnuPG instalÂ·lat, utilitza l'eina gpg\n"
@@ -460,37 +379,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "La sortida te de semblar alguna cosa semblant a :\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "Si no estas familiaritzat amb els comanaments en linia, prova alguna\n"
@@ -498,17 +400,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Si la teva connexiÃ³ internet bloqueja l'acces a la xarxa Tor, et\n"
@@ -520,15 +420,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "Pots adquirir un pont enviant un email amb la frase \"get bridges\"\n"
@@ -537,14 +433,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "Es posible buscar ponts amb un navegador a la\n"
@@ -552,16 +445,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "NOTA IMPORTANT:\n"
@@ -571,13 +462,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "Els paquets poden estar desordenats! Siusplau, asegura't de rebre\n"
@@ -585,16 +474,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Gracies per la teva peticiÃ³. Ha quedat tot entÃ¨s. La peticiÃ³\n"
@@ -604,16 +489,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "Si no t'arriba,podria ser que el paquet fos massa gran pel teu proveidor de "
@@ -624,18 +504,49 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "Desafortunadament estem tenint problemes i no podem enviar-tel\n"
 "el que ens has demanat ara. Siusplau tingues paciencia mentre ho resolem.\n"
 "\n"
 "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3.) Renomena l'arxiu acabat en \".ex_RENAME\" en un \".exe\" i tambÃ© \n"
+#~ "l'arxiu acabat en \".ex_RENAME.asc\" en\n"
+#~ "\".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "SUPORT\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
diff --git a/i18n/cs/gettor.po b/i18n/cs/gettor.po
index 7769787..78e6799 100644
--- a/i18n/cs/gettor.po
+++ b/i18n/cs/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-08-22 22:10+0200\n"
 "Last-Translator: Martin <martinbarta@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "DobrÃ½ den, to je  \"GetTor\" robot.\n"
@@ -33,116 +31,78 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -153,270 +113,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:499
-msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/csb/gettor.po b/i18n/csb/gettor.po
index e7e6736..a711308 100644
--- a/i18n/csb/gettor.po
+++ b/i18n/csb/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/cy/gettor.po b/i18n/cy/gettor.po
index e7e6736..a711308 100644
--- a/i18n/cy/gettor.po
+++ b/i18n/cy/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/da/gettor.po b/i18n/da/gettor.po
index fea0470..1d1cfbe 100644
--- a/i18n/da/gettor.po
+++ b/i18n/da/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-08-03 19:26+0200\n"
 "Last-Translator: benne <benne@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Hej, dette er \"GetTor\" robotten.\n"
@@ -33,14 +31,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "DesvÃ¦rre vil vi ikke besvare dig pÃ¥ denne adresse. Du burde oprette\n"
@@ -48,29 +44,26 @@ msgstr ""
 "disse.\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "Vi behandler kun forespÃ¸rgsler fra email services der supporterer \"DKIM\"\n"
-"der er en email egenskab der lader os verificere at adressen i \"Fra\" feltet\n"
+"der er en email egenskab der lader os verificere at adressen i \"Fra\" "
+"feltet\n"
 "er den faktiske afsender af mailen.\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(Vi undskylder hvis du ikke har bedt om denne mail. Siden din email er "
@@ -80,13 +73,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "BemÃ¦rk at vi pt. ikke kan behandle HTML emails eller base 64 kodede emails.\n"
@@ -94,27 +85,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
-"Hvis du har spÃ¸rgsmÃ¥l eller det ikke virker, kan du fÃ¥ kontakt til en person\n"
+"Hvis du har spÃ¸rgsmÃ¥l eller det ikke virker, kan du fÃ¥ kontakt til en "
+"person\n"
 "via fÃ¸lgende support emailadresse: tor-assistants@xxxxxxxxxxxxxx\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Jeg vil emaile dig en Tor pakke, hvis du fortÃ¦ller mig hvilken du vil have.\n"
@@ -122,13 +110,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Besvar venligst denne email (til gettor@xxxxxxxxxxxxxx), og angiv navnet\n"
@@ -136,23 +122,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "FÃ? OVERSATTE VERSIONER AF TOR\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Send en email til den specifikke emailadresse for dit sprog, for at fÃ¥ en\n"
@@ -160,14 +142,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "Dette eksempel vil give dig den forespurgte pakke i en oversat version for\n"
@@ -175,31 +155,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Liste af supporterede oversÃ¦ttelser:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "Her er en liste af alle tilgÃ¦ngelige sprog:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -210,9 +185,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: Arabisk\n"
@@ -229,63 +202,53 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "Hvis du ikke angiver et sprog, vil du modtage den engelske version.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "MINDRE PAKKER (STÃ?RRELSE)\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
-"Hvis din bÃ¥ndbredde er lille, eller din udbyder ikke tillader dig at modtage\n"
+"Hvis din bÃ¥ndbredde er lille, eller din udbyder ikke tillader dig at "
+"modtage\n"
 "store vedhÃ¦ftninger i dine email, er der en funktion i GetTor du kan bruge "
 "til\n"
 "at fÃ¥ den til at sende dig en rÃ¦kke mindre pakker istedet for en stor en.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "Inkluder nÃ¸gleordet 'split' et eller andet sted i din email, som her:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "Hvis du sender denne tekst i en email til GetTor, vil den sende\n"
@@ -293,13 +256,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "Efter du har modtaget alle dele skal du sammensÃ¦tte dem til Ã©n pakke igen.\n"
@@ -307,55 +268,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "1.) Gem alle modtagede vedhÃ¦ftninger i Ã©n folder pÃ¥ din disk.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"2.) Unzip alle filer der ender med \".z\". Hvis du gemte alle vedhÃ¦ftningerne\n"
+"2.) Unzip alle filer der ender med \".z\". Hvis du gemte alle "
+"vedhÃ¦ftningerne\n"
 "i en tom folder fÃ¸r, sÃ¥ unzip alle filerne i denne folder.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3.) OmdÃ¸b filen med endelsen \".ex_RENAME\" til at have endelsen \".exe\",\n"
-"og omdÃ¸b filen med endelsen \".ex_RENAME.asc\" til at have endelsen\n"
-"\".exe.asc\".\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "4.) Verificer alle filer som beskrevet i den email du modtog med\n"
@@ -363,14 +302,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "5.) Brug et program der kan udpakke multivolume RAR arkiver. PÃ¥\n"
@@ -379,26 +316,21 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "Dobbeltklik pÃ¥ \".exe\"-filen for at udpakke din Tor pakke.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "6.) Efter du har udpakket, burde du finde en ny \".exe\"-fil i din\n"
@@ -407,35 +339,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "7.) Det var det. Du er nu fÃ¦rdig. Tak fordi du bruger Tor!\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"SUPPORT\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "Her er din forespurgte software som en zip-fil. Unzip pakken\n"
@@ -443,13 +364,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "Tip: Hvis din computer har GnuPG installeret, kan du bruge gpg "
@@ -458,37 +377,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --verify <pakkenavn>.asc <pakkenavn>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "Resultatet burde vÃ¦re nogenlunde som dette:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "Hvis du ikke fÃ¸ler dig hjemme i kommandolinie-vÃ¦rktÃ¸jer, kan du\n"
@@ -496,17 +398,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Hvis din internetforbindelse blokerer adgang til Tor-netvÃ¦rket, er du\n"
@@ -518,15 +418,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "Du kan forespÃ¸rge om en bridge ved at sende en email, der indeholder\n"
@@ -535,14 +431,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "Det er ogsÃ¥ muligt at hente bridges via en web browser pÃ¥ fÃ¸lgende url:\n"
@@ -550,16 +443,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "VIGTIGT:\n"
@@ -570,13 +461,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "Pakker kommer mÃ¥ske ude af rÃ¦kkefÃ¸lge! VÃ¦r' sikker pÃ¥ du har\n"
@@ -584,16 +473,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Tak for din forespÃ¸rgsel. Den var forstÃ¥et uden problemer. Din forespÃ¸rgsel\n"
@@ -602,16 +487,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "Hvis den ikke ankommer er pakken mÃ¥ske for stor til din emailudbyder.\n"
@@ -621,15 +501,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "Vi oplever desvÃ¦rre problemer i Ã¸jeblikket, og vi kan ikke fuldfÃ¸re din\n"
@@ -637,3 +513,39 @@ msgstr ""
 "problemet.\n"
 "\n"
 "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3.) OmdÃ¸b filen med endelsen \".ex_RENAME\" til at have endelsen \".exe"
+#~ "\",\n"
+#~ "og omdÃ¸b filen med endelsen \".ex_RENAME.asc\" til at have endelsen\n"
+#~ "\".exe.asc\".\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "SUPPORT\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --verify <pakkenavn>.asc <pakkenavn>\n"
+#~ "\n"
+#~ "    "
diff --git a/i18n/de/gettor.po b/i18n/de/gettor.po
index ff5e10c..5350d3d 100644
--- a/i18n/de/gettor.po
+++ b/i18n/de/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-04-16 09:20-0600\n"
 "Last-Translator: CS <cs@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "    Hallo, dies ist der \"GetTor\"-Robot.\n"
@@ -31,14 +30,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "    Leider werden wir Ihnen nicht an diese Adresse antworten. Sie sollten\n"
@@ -46,30 +43,27 @@ msgstr ""
 "    eine E-Mail senden.\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
-"    Wir bearbeiten nur Anfragen von E-maildiensten, die \"DKIM\" unterstÃ¼tzen.\n"
+"    Wir bearbeiten nur Anfragen von E-maildiensten, die \"DKIM\" "
+"unterstÃ¼tzen.\n"
 "    \"DKIM\" ist eine Funktion, die es uns erlaubt, zu Ã¼berprÃ¼fen, dass\n"
 "    eine E-mail wirklich vom angegebenen Absender geschickt wurde.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "    (Wir bitten um Entschuldigung falls sie diese E-Mail nicht angefordert "
@@ -80,13 +74,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "    Wir kÃ¶nnen zur Zeit leider keine HTML oder base 64 Emails bearbeiten.\n"
@@ -94,13 +86,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "    Sollten Sie Fragen haben, oder sollte etwas nicht funktionieren, kÃ¶nnen "
@@ -110,13 +100,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "    Ich werden Ihnen ein Torpaket zumailen, wenn Sie mir sagen kÃ¶nnen, "
@@ -125,39 +113,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    Bitte antworten Sie auf diese E-mail (an gettor@xxxxxxxxxxxxxx), und "
 "schreiben Sie\n"
-"    einen einzigen Paketnamen an irgendeiner Stelle im TextkÃ¶rper Ihrer "
-"E-mail.\n"
+"    einen einzigen Paketnamen an irgendeiner Stelle im TextkÃ¶rper Ihrer E-"
+"mail.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "    Ã?BERSETZTE VERSIONEN VON TOR ERHALTEN\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "    Um eine Ã¼bersetzte Version von Tor in Ihrer Sprache zu erhalten, geben "
@@ -166,14 +148,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "    Dieses Beispiel zeigt das angefragte Paket in einer fÃ¼r das Chinesische "
@@ -182,31 +162,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "    Liste der unterstÃ¼tzten Sprachen:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "    Hier ist eine Liste der verfÃ¼gbaren Sprachen:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -217,9 +192,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabisch\n"
@@ -236,12 +209,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "    Sollten Sie keine Sprache asuwÃ¤hlen, werden Sie die englische Version "
@@ -249,25 +219,17 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
-"\n"
-"    KLEINERE PAKETE\n"
-"    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "    Wenn Ihre Bandbreite gering ist, oder Ihr Anbieter keine grossen\n"
@@ -277,24 +239,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "    Schreiben SIe dazu einfach das SchlÃ¼sselwort 'split' an irgendeine "
 "Stelle in Ihrer E-mail, z.B. so:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "     Das Senden dieses Textes in einer E-mail an GetTor wird dazu fÃ¼hren, "
@@ -304,13 +262,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "    Nachdem Sie alle Teile erhalten haben, mÃ¼ssen diese wieder zu einem\n"
@@ -318,12 +274,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "    1.) Speichern Sie alle erhaltenen DateianhÃ¤nge in einen Ordner auf Ihrer "
@@ -331,63 +284,41 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"    2.) Entpacken Sie alle Zip-Dateien mit der Endung \".z\". Sollten Sie alle "
-"AnhÃ¤nge in\n"
+"    2.) Entpacken Sie alle Zip-Dateien mit der Endung \".z\". Sollten Sie "
+"alle AnhÃ¤nge in\n"
 "        einen neuen Ordner abgespeichert haben, entpacken Sie einfach alle "
 "Dateien in diesem Ordner.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"    3.) Benennen Sie die Endung \".ex_RENAME\" der Datei in \".exe\" um und \n"
-"        benennen Sie ebenfalls die Datei, die auf \".ex_RENAME.asc\" endet in\n"
-"        \".exe.asc\" um.\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
-"    4.) Ã?berprÃ¼fen Sie alle Dateien, so wie in den E-mails beschrieben, die "
+"    3.) Ã?berprÃ¼fen Sie alle Dateien, so wie in den E-mails beschrieben, die "
 "Sie mit\\         jedem Paket erhalten haben. (gpg --verify)\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
-"    5.) Benutzen Sie nun ein Programm, das RAR-Archive, die aus multiplen "
+"    4.) Benutzen Sie nun ein Programm, das RAR-Archive, die aus multiplen "
 "Dateien bestehen, entpacken kann.\n"
 "        Unter Windows ist so ein Programm fÃ¼r gewÃ¶hnlich WinRAR.\n"
 "        Sollten Sie dieses Programm nicht besitzen, kÃ¶nnen Sie es hier "
@@ -395,79 +326,62 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
-"        Um das Torpaket zu entpacken, doppelklicken Sie einfach auf die "
-"\".exe\" Datei.\n"
+"        Um das Torpaket zu entpacken, doppelklicken Sie einfach auf die \"."
+"exe\" Datei.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
-"    6.) Nach dem Entpacken, sollten Sie eine neu erstellte \".exe\"-Datei\n"
+"    5.) Nach dem Entpacken, sollten Sie eine neu erstellte \".exe\"-Datei\n"
 "         im Zielordner finden. Doppelklicken Sie diese einfach und das\n"
 "        Tor Browser Bundle sollte in wenigen Sekunden starten.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
-"    7.) Das ist alles. Sie sind fertig. Vielen Dank, dass Sie Tor nutzen und "
+"    6.) Das ist alles. Sie sind fertig. Vielen Dank, dass Sie Tor nutzen und "
 "viel Spass!\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"    HILFE\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
-"    Hier ist das angefragte Programm in einer Zip-Datei. Bitte entpacken Sie\n"
+"    Hier ist das angefragte Programm in einer Zip-Datei. Bitte entpacken "
+"Sie\n"
 "    diese und Ã¼berprÃ¼fen Sie die Signatur.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "    Tipp: Wenn Sie GnuPG auf Ihrem Computer installiert haben, benutzen\n"
@@ -475,37 +389,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "    Die Ausgabe sollte ungefÃ¤hr wie folgt aussehen:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "    Sollten Sie mit Befehlszeilen nicht vertraut sein, kÃ¶nnen Sie auf\n"
@@ -513,17 +410,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    Sollte Ihre Internetverbindung den Zugang zum Tornetzwek blockieren,\n"
@@ -538,32 +433,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
-"    Sie kÃ¶nnen Zugang zu einem BrÃ¼cken-Server erhalten, indem Sie eine "
-"E-mail\n"
+"    Sie kÃ¶nnen Zugang zu einem BrÃ¼cken-Server erhalten, indem Sie eine E-"
+"mail\n"
 "    mit den Worten \"get bridges\" im TextkÃ¶rper an:\n"
 "    bridges@xxxxxxxxxxxxxx senden.\n"
 " \n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "    Ausserdem kÃ¶nnen BrÃ¼cken-Server mit einem Webbrowser unter der\n"
@@ -572,16 +460,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    WICHTIGE ANMERKUNG:\n"
@@ -592,13 +478,11 @@ msgstr ""
 "    entpackt werden kÃ¶nnen.\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "    Die Dateien kÃ¶nnten in ungeordneter Reihenfolge ankommen! Bitte "
@@ -607,16 +491,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Vielen Dank fÃ¼r Ihre Anfrage. Diese wurder erfolgreich interpretiert und "
@@ -626,20 +506,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
-"    Sollte es nicht ankommen, ist das Paket eventuell zu gross fÃ¼r Ihren "
-"E-Mailanbieter.\n"
+"    Sollte es nicht ankommen, ist das Paket eventuell zu gross fÃ¼r Ihren E-"
+"Mailanbieter.\n"
 "    Versuchen Sie die E-mail von einem gmail.com oder yahoo.cn Konto erneut "
 "zu senden.\n"
 "    Versuchen Sie ausserdem, ein tor-browser-bundle anstelle eines\n"
@@ -647,423 +522,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "    Leider haben wir zur Zeit technische Probleme und kÃ¶nnen Ihrer Anfrage\n"
 "    im Moment nicht nachkommen. Bitte habe Sie ein wenig Geduld\n"
 "    wÃ¤hrend wir versuchen das Problem in den Griff zu bekommen.\n"
 "    "
-
-#~ 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"
-#~ "\n"
-#~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
-#~ "    \"From\" line is actually the one who sent the mail.\n"
-#~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
-#~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
-#~ "    and then we'll ignore this email address for the next day or so.)\n"
-#~ "\n"
-#~ "    Please note that currently, we can't process HTML emails or base 64\n"
-#~ "    mails. You will need to send plain text.\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"
-#~ "        "
-#~ msgstr ""
-#~ "\n"
-#~ "Guten Tag!\n"
-#~ "Dies ist eine automatische Antwort vom \"GetTor\" Service.\n"
-#~ "\n"
-#~ "Leider kÃ¶nnen wir auf Ihre Anfrage/ihren email-Adresse keine Antwort "
-#~ "versenden\n"
-#~ "Bitte verwenden Sie einen Account wie z.B. GMAIL.COM oder YAHOO.CN und "
-#~ "senden Sie Ihre Anfrage von dort aus.\n"
-#~ "\n"
-#~ "Antworten versenden wir ausschliesslich an Adressen die \"DKIM\",\n"
-#~ "unterstÃ¼tzen. Dies ist eine Email-Funktion die es uns erlaubt den Absender "
-#~ "zu verifizieren.\n"
-#~ "Die PrÃ¼fung beschrÃ¤nkt sich allerdings darauf den Inhalt des Feldes \"From\" "
-#~ "gegen den Absender zu vergleichen.\n"
-#~ "\n"
-#~ "(Sofern Sie diese Email gar nicht erstellt haben entschuldigen wir uns "
-#~ "ausdrÃ¼cklich fÃ¼r diese Antwort. )\n"
-#~ "\n"
-#~ "Bitte beachten Sie, dass wir keine HTML-Emails bzw. base64 codierte Emails "
-#~ "verarbeiten kÃ¶nnen. Emails mÃ¼ssen als Klar-Text verschickt werden.\n"
-#~ "\n"
-#~ "Sofern Sie Fragen haben oder Probleme auftreten, kann Ihnen mÃ¶glicherweise "
-#~ "ein Mitarbeiter unter folgender Adresse weiterhelfen:\n"
-#~ "tor-assistants@xxxxxxxxxxxxxx\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "    Hello, This is the \"GetTor\" robot.\n"
-#~ "\n"
-#~ "    I will mail you a Tor package, if you tell me which one you want.\n"
-#~ "    Please select one of the following package names:\n"
-#~ "\n"
-#~ "        tor-browser-bundle\n"
-#~ "        macosx-i386-bundle\n"
-#~ "        macosx-ppc-bundle\n"
-#~ "        tor-im-browser-bundle\n"
-#~ "        source-bundle\n"
-#~ "\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"
-#~ "    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-#~ "    ===================================\n"
-#~ "\n"
-#~ "    To get a version of Tor translated into your language, specify the\n"
-#~ "    language you want in the address you send the mail to:\n"
-#~ "\n"
-#~ "        gettor+zh@xxxxxxxxxxxxxx\n"
-#~ "\n"
-#~ "    This example will give you the requested package in a localized\n"
-#~ "    version for Chinese. Check below for a list of supported language\n"
-#~ "    codes.\n"
-#~ "\n"
-#~ "    List of supported locales:\n"
-#~ "    -------------------------\n"
-#~ "\n"
-#~ "    Here is a list of all available languages:\n"
-#~ "\n"
-#~ "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
-#~ "    gettor+de@xxxxxxxxxxxxxx:     German\n"
-#~ "    gettor+en@xxxxxxxxxxxxxx:     English\n"
-#~ "    gettor+es@xxxxxxxxxxxxxx:     Spanish\n"
-#~ "    gettor+fa@xxxxxxxxxxxxxx:     Farsi (Iran)\n"
-#~ "    gettor+fr@xxxxxxxxxxxxxx:     French\n"
-#~ "    gettor+it@xxxxxxxxxxxxxx:     Italian\n"
-#~ "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
-#~ "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
-#~ "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-#~ "    gettor+zh@xxxxxxxxxxxxxx:     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 ""
-#~ "\n"
-#~ "Guten Tag!\n"
-#~ "Dies ist eine autmatische Email vom \"GetTor\" Service.\\\n"
-#~ "Ich kann Ihnen das gewÃ¼nschte Tor Paket zusenden sofern Sie mir mitteilen "
-#~ "welches Sie wollen.\n"
-#~ "Bitte wÃ¤hlen Sie aus den folgenden Paketen:\n"
-#~ "\n"
-#~ "tor-browser-bundle\n"
-#~ "macosx-i386-bundle\n"
-#~ "macosx-ppc-bundle\n"
-#~ "tor-im-browser-bundle\n"
-#~ "source-bundle\n"
-#~ "\n"
-#~ "Bitte antworten Sie auf dieses Email (an: gettor@xxxxxxxxxxxxxx), und teilen "
-#~ "Sie mit, welches Paket Sie erhalten mÃ¶chten.\n"
-#~ "Dazu bitte nur genau EIN Paket im Textbereich des Emails erwÃ¤hnen.\n"
-#~ "\n"
-#~ "Ã?BERSETZTE VERSIONEN VON TOR\n"
-#~ "===================================\n"
-#~ "\n"
-#~ "Um eine Ã¼bersetzte Version von Tor in Ihrer Sprache zu erhalten\n"
-#~ "senden Sie ein Email an:\n"
-#~ "\n"
-#~ "gettor+zh@xxxxxxxxxxxxxx\n"
-#~ "\n"
-#~ "Das o.g. Beispiel ist fÃ¼r eine Version von Tor in Chinesisch...\n"
-#~ "WÃ¤hlen Sie aus der Liste die gewÃ¼nschte Version aus.\n"
-#~ "\n"
-#~ "Liste der vorhandenen Pakete:\n"
-#~ "-------------------------\n"
-#~ "\n"
-#~ "gettor+ar@xxxxxxxxxxxxxx: Arabisch\n"
-#~ "gettor+de@xxxxxxxxxxxxxx: Deutsch\n"
-#~ "gettor+en@xxxxxxxxxxxxxx: Englisch\n"
-#~ "gettor+es@xxxxxxxxxxxxxx: Spanisch\n"
-#~ "gettor+fa@xxxxxxxxxxxxxx: Farsi (Iran)\n"
-#~ "gettor+fr@xxxxxxxxxxxxxx: FranzÃ¶sisch\n"
-#~ "gettor+it@xxxxxxxxxxxxxx: Italienisch\n"
-#~ "gettor+nl@xxxxxxxxxxxxxx: HollÃ¤ndisch\n"
-#~ "gettor+pl@xxxxxxxxxxxxxx: Polnisch\n"
-#~ "gettor+ru@xxxxxxxxxxxxxx: Russisch\n"
-#~ "gettor+zh@xxxxxxxxxxxxxx: Chinesisch\n"
-#~ "\n"
-#~ "Sofern Sie keine Sprache explizit auswÃ¤hlen, erhalten Sie die englische "
-#~ "Version.\n"
-#~ "\n"
-#~ "SUPPORT\n"
-#~ "=======\n"
-#~ "\n"
-#~ "Bei Fragen oder falls etwas nicht funktioniert wenden Sie sich bitte an "
-#~ "einen Mitarbeiter unter: \n"
-#~ "tor-assistants@xxxxxxxxxxxxxx\n"
-#~ "\n"
-
-#~ 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 ""
-#~ "\n"
-#~ "Guten Tag! Dies ist eine automatische Nachricht vom \"GetTor\" Service.\n"
-#~ "\n"
-#~ "Anbei finden Sie die angeforderte Software als ZIP-Datei. \n"
-#~ "Bitte entpacken Sie die Daten und prÃ¼fen Sie die Signatur.\n"
-#~ "\n"
-#~ "Tipp: Sofern auf Ihrem Rechner kein GnuPG installiert ist kÃ¶nnen Sie \n"
-#~ "nach dem Entpacken folgende Kommandozeilen-Tools verwenden:\n"
-#~ "\n"
-#~ "gpg --verify <packagename>.asc <packagename>\n"
-#~ "\n"
-#~ "Die Antwort sollte in etwa wie folgt aussehen:\n"
-#~ "\n"
-#~ "gpg: Good signature from \"Roger Dingledine <arma@xxxxxxx>\"\n"
-#~ "\n"
-#~ "Falls Sie mit der Kommandozeile nicht vertraut sind versuchen Sie doch\n"
-#~ "eine der grafischen Tools auf der Web-Seite:\n"
-#~ "\n"
-#~ "http://www.gnupg.org/related_software/frontends.html\n";
-#~ "\n"
-#~ "Sofern Ihre Internetverbindung fÃ¼r eine Verbindung zum Tor-Netzwerk gesperrt "
-#~ "ist\n"
-#~ "benÃ¶tigen Sie eine BrÃ¼cke (Bridge relay). Diese Bridge relays (oder "
-#~ "\"bridges\")\n"
-#~ "sind Tor Verbindungen welche nicht als Hauptknoten gelistet sind. \n"
-#~ " Viele dieser Bridges kÃ¶nnen, aufgrund der mangelnden Kenntnis, bei \n"
-#~ "den Zugangsprovidern nicht alle blockiert werden.\n"
-#~ "Sie erhalten eine Liste von verfÃ¼gbaren Bridges indem Sie eine Email mit dem "
-#~ "Text \"get bridges\"\n"
-#~ "im Email-Text an die folgende Addresse schicken:\n"
-#~ "bridges@xxxxxxxxxxxxxx\n"
-#~ "\n"
-#~ "Eine Liste der Bridges im Internet finden Sie unter:\n"
-#~ "https://bridges.torproject.org/\n";
-#~ "\n"
-#~ "Sollten dennoch Probleme auftreten oder Sie Fragen haben, die hier nicht "
-#~ "gelÃ¶st werden kÃ¶nnen, \n"
-#~ "so wenden Sie sich bitte per Email an einen Supporter unter der Adresse:\n"
-#~ "tor-assistants@xxxxxxxxxxxxxx\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "    Hello! This is the \"GetTor\" robot.\n"
-#~ "\n"
-#~ "    Here's your requested software as a zip file. Please unzip the\n"
-#~ "    package and verify the signature.\n"
-#~ "\n"
-#~ "    IMPORTANT NOTE:\n"
-#~ "    Since this is part of a split-file request, you need to wait for\n"
-#~ "    all split files to be received by you before you can save them all\n"
-#~ "    into the same directory and unpack them by double-clicking the\n"
-#~ "    first file.\n"
-#~ "\n"
-#~ "    Packages might come out of order! Please make sure you received\n"
-#~ "    all packages before you attempt to unpack them!\n"
-#~ "\n"
-#~ "    Hint: If your computer has GnuPG installed, use the gpg\n"
-#~ "    commandline tool as follows after unpacking the zip file:\n"
-#~ "\n"
-#~ "       gpg --verify <packagename>.asc <packagename>\n"
-#~ "\n"
-#~ "    The output should look somewhat like this:\n"
-#~ "\n"
-#~ "       gpg: Good signature from \"Roger Dingledine <arma@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 ""
-#~ "\n"
-#~ "Guten Tag! Dies ist eine automatische Nachricht vom \"GetTor\" Service.\n"
-#~ "\n"
-#~ "Anbei finden Sie die gewÃ¼nschte Software als ZIP-Datei.\n"
-#~ "Bitte entpacken Sie die Dateien und prÃ¼fen Sie die Signatur.\n"
-#~ "\n"
-#~ "WICHTIG:\n"
-#~ "Sofern die Software als aufgeteiltes ZIP-File verschickt wurde\n"
-#~ "mÃ¼ssen Sie warten bis alle Teile im selben Verzeichnis vorhanden sind.\n"
-#~ "Erst dann funktioniert das Entpacken durch Doppelklick auf die erste Datei.\n"
-#~ "\n"
-#~ "Das Gesamtpaket muss nicht in der richtigen Reihenfolge ankommen!\n"
-#~ "\n"
-#~ "Tipp: Sofern auf Ihrem Rechner kein GnuPG installiert ist kÃ¶nnen Sie \n"
-#~ "nach dem Entpacken folgende Kommandozeilen-Tools verwenden:\n"
-#~ "\n"
-#~ "gpg --verify <packagename>.asc <packagename>\n"
-#~ "\n"
-#~ "Die Antwort sollte in etwa wie folgt aussehen:\n"
-#~ "\n"
-#~ "gpg: Good signature from \"Roger Dingledine <arma@xxxxxxx>\"\n"
-#~ "\n"
-#~ "Falls Sie mit der Kommandozeile nicht vertraut sind versuchen Sie doch\n"
-#~ "eine der grafischen Tools auf der Web-Seite:\n"
-#~ "\n"
-#~ "http://www.gnupg.org/related_software/frontends.html\n";
-#~ "\n"
-#~ "Sofern Ihre Internetverbindung fÃ¼r eine Verbindung zum Tor-Netzwerk gesperrt "
-#~ "ist\n"
-#~ "benÃ¶tigen Sie eine BrÃ¼cke (Bridge relay). Diese Bridge relays (oder "
-#~ "\"bridges\")\n"
-#~ "sind Tor Verbindungen welche nicht als Hauptknoten gelistet sind. \n"
-#~ " Viele dieser Bridges kÃ¶nnen, aufgrund der mangelnden Kenntnis, bei \n"
-#~ "den Zugangsprovidern nicht alle blockiert werden.\n"
-#~ "Sie erhalten eine Liste von verfÃ¼gbaren Bridges indem Sie eine Email mit dem "
-#~ "Text \"get bridges\"\n"
-#~ "im Email-Text an die folgende Addresse schicken:\n"
-#~ "bridges@xxxxxxxxxxxxxx\n"
-#~ "\n"
-#~ "Eine Liste der Bridges im Internet finden Sie unter:\n"
-#~ "https://bridges.torproject.org/\n";
-#~ "\n"
-#~ "Sollten dennoch Probleme auftreten oder Sie Fragen haben, die hier nicht "
-#~ "gelÃ¶st werden kÃ¶nnen, \n"
-#~ "so wenden Sie sich bitte per Email an einen Supporter unter der Adresse:\n"
-#~ "tor-assistants@xxxxxxxxxxxxxx\n"
-#~ "\n"
-
-#~ 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 ""
-#~ "\n"
-#~ "Guten Tag! Dies ist eine automatische Nachricht vom \"GetTor\" Service.\n"
-#~ "\n"
-#~ "Vielen Dank fÃ¼r Ihre Anfrage. Wir denken wir haben Sie verstanden.\n"
-#~ "Die Anfrage ist in Bearbeitung. Das angeforderte Paket sollte in den "
-#~ "nÃ¤chsten 10 Minuten ankommen.\n"
-#~ "\n"
-#~ "Sofern es nicht angekommt liegt es mÃ¶glicherweise an Ihrem Email-Provider.\n"
-#~ "Das Paket kÃ¶nnte zu gross sein.\n"
-#~ "Versuchen Sie es in diesem Fall bitte Ã¼ber einen anderen Zugang, z.B. Ã¼ber "
-#~ "gmail.com oder yahoo.cn .\n"
-#~ "Sie kÃ¶nnen auch ein kleineres Paket anfordern:\n"
-#~ "statt nach tor-im-browser-bundle fragen Sie nach tor-browser-bundle\n"
-#~ "-- dieses sollte kleiner sein --\n"
-#~ "\n"
-#~ "Sollten dennoch Probleme auftreten oder Sie Fragen haben, die hier nicht "
-#~ "gelÃ¶st werden kÃ¶nnen, \n"
-#~ "wenden Sie sich bitte per Email an einen Supporter unter der Adresse:\n"
-#~ "tor-assistants@xxxxxxxxxxxxxx\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "    Hello, This is the \"GetTor\" robot.\n"
-#~ "\n"
-#~ "    Thank you for your request.\n"
-#~ "\n"
-#~ "    Unfortunately we are currently experiencing problems and we can't "
-#~ "fulfill\n"
-#~ "    your request right now. Please be patient as we try to resolve this "
-#~ "issue.\n"
-#~ "\n"
-#~ "        "
-#~ msgstr ""
-#~ "\n"
-#~ "Guten Tag! Dies ist eine automatische Nachricht vom \"GetTor\" Service.\n"
-#~ "\n"
-#~ "Vielen Dank fÃ¼r Ihre Anfrage.\n"
-#~ "\n"
-#~ "Leider gibt es zur Zeit technische Probleme, und wir kÃ¶nnen Ihre Anfrage "
-#~ "nicht bearbeiten.\n"
-#~ "Bitte gedulden Sie sich oder versuchen Sie es zu einem spÃ¤teren Zeitpunkt "
-#~ "erneut.\n"
-#~ "Wir versuchen dennoch so schnell wie mÃ¶glich Ihre Anfrage abzuarbeiten.\n"
diff --git a/i18n/dz/gettor.po b/i18n/dz/gettor.po
index e7e6736..a711308 100644
--- a/i18n/dz/gettor.po
+++ b/i18n/dz/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/el/gettor.po b/i18n/el/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/el/gettor.po
+++ b/i18n/el/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/en/gettor.po b/i18n/en/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/en/gettor.po
+++ b/i18n/en/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/eo/gettor.po b/i18n/eo/gettor.po
index e7e6736..a711308 100644
--- a/i18n/eo/gettor.po
+++ b/i18n/eo/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/es/gettor.po b/i18n/es/gettor.po
index b1732e7..6abd9a2 100644
--- a/i18n/es/gettor.po
+++ b/i18n/es/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-09-28 22:42+0200\n"
 "Last-Translator: Ricardo A. <ra.hermosillac@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Hola, este es el robot \"GetTor\".\n"
@@ -33,14 +31,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "Desafortunadamente, no podremos responerle a esta direcciÃ³n. Usted debe\n"
@@ -49,14 +45,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "Nosotros sÃ³lo procesamos solicitudes desde servicios de email que brindan\n"
@@ -67,31 +61,28 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(Nos disculpamos si usted no preguntÃ³ por este correo. Dado que su email es\n"
 "de\n"
-"un servicio que no utiliza DKIM, le estamos enviando una explicaciÃ³n corta y\n"
+"un servicio que no utiliza DKIM, le estamos enviando una explicaciÃ³n corta "
+"y\n"
 "luego\n"
 "ignoraremos esta direcciÃ³n email para el dÃa siguiente mÃ¡s o menos.)\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "Por favor, note que actualmente no podemos procesar correos en HTML o Base\n"
@@ -100,13 +91,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Si usted tiene cualquier pregunta o no funciona, puede contactar a una\n"
@@ -115,13 +104,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Le enviarÃ© un correo con el paquete Tor, si me dice cuÃ¡l es el que quiere.\n"
@@ -129,13 +116,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Por favor, responda este correo (a gettor@xxxxxxxxxxxxxx) y mencione\n"
@@ -143,23 +128,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "OBTENIENDO VERSIONES LOCALIZADAS DE TOR\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Para obtener una versiÃ³n de Tor traducida a su lenguaje, especifique el\n"
@@ -167,14 +148,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "Este ejemplo le darÃ¡ el paquete solicitado en una versiÃ³n localizada\n"
@@ -183,31 +162,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Lista de los idiomas soportados:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "AquÃ estÃ¡ una lista de todos los idiomas disponibles:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -218,9 +192,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Ã?rabe\n"
@@ -237,65 +209,55 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "Si no selecciona un idioma, recibirÃ¡ la versiÃ³n en InglÃ©s\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "PAQUETES MÃ?S PEQUEÃ?OS\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "Si su ancho de banda es baja o su proveedor no le permite recibir archivos\n"
-"adjuntos de gran tamaÃ±o en su email, existe una caracterÃstica en GetTor que\n"
+"adjuntos de gran tamaÃ±o en su email, existe una caracterÃstica en GetTor "
+"que\n"
 "puede utilizar para hacerlo enviar un nÃºmero de paquetes pequeÃ±os en lugar\n"
 "de\n"
 "uno grande.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "Simplemente incluya la palabra clave 'split' en algÃºn lugar en su email,\n"
 "como por ejemplo:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "Enviando este texto en un correo electrÃ³nico a GetTor harÃ¡ que se le envÃe\n"
@@ -304,13 +266,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "DespuÃ©s de haber recibido todas las partes, necesita volver a reunirlas aun\n"
@@ -318,12 +278,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "1) Guarde todos los archivos adjuntos recibidos en un directorio de su\n"
@@ -331,16 +288,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"2) Descomprima todos los archivos que terminan en \".z\". Si ha guardado todos\n"
+"2) Descomprima todos los archivos que terminan en \".z\". Si ha guardado "
+"todos\n"
 "los\n"
 "archivos adjuntos en un nuevo directorio, simplemente descomprima todos los\n"
 "archivos\n"
@@ -348,28 +304,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3) Renombre el archivo terminado en \".ex_RENAME\" a \".exe\" y tambiÃ©n el que\n"
-"termina en \".ex_RENAME.asc\" a \".exe.asc\".\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "4) Verifique todos los archivos como se describe en el correo que recibiÃ³\n"
@@ -378,14 +317,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "5) Ahora utilice un programa que pueda descomprimir archivos RAR mÃºltiples.\n"
@@ -395,12 +332,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "Para descomprimir su paquete de Tor, simplemente haga doble clic en el\n"
@@ -408,14 +342,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "6) DespuÃ©s de que el desempaquetado termine, deberÃ¡ encontrar un nuevo\n"
@@ -426,50 +358,38 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "7) Eso es todo. Ha terminado. Gracias por utilizar Tor y diviÃ©rtase\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"SOPORTE\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
-"AquÃ estÃ¡ su software solicitado como un archivo zip. Por favor, descomprima\n"
+"AquÃ estÃ¡ su software solicitado como un archivo zip. Por favor, "
+"descomprima\n"
 "el\n"
 "paquete y verifique la firma.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "Consejo: Si su ordenador tiene instalado GnuGP, utilice el comando gpg como\n"
@@ -478,37 +398,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "El resultado deberÃa ser algo como esto:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "Si usted no estÃ¡ familiarizado con herramientas de lÃnea de comandos,\n"
@@ -517,58 +420,52 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Si su conexiÃ³n a Internet bloquea el acceso a la red Tor, necesitarÃ¡ un\n"
 "puente retransmisor.\n"
-"Puente retransmisor (o \"puentes\" para abreviar), son los retransmisores de\n"
+"Puente retransmisor (o \"puentes\" para abreviar), son los retransmisores "
+"de\n"
 "Tor que no estÃ¡n\n"
 "listados en el directorio principal. Puesto que no hay una lista completa y\n"
 "pÃºblica de ellos,\n"
-"incluso si su ISP estÃ¡ filtrando conexiones para todos los retransmisores de\n"
+"incluso si su ISP estÃ¡ filtrando conexiones para todos los retransmisores "
+"de\n"
 "Tor,\n"
 "probablemente no les estÃ¡ permitido bloquear todos los puentes.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "    Usted puede adquirir un puente mediante el envÃo de un correo\n"
 "electrÃ³nico que contiene \"get bridges\"\n"
-"    en el cuerpo del correo electrÃ³nico a la direcciÃ³n de correo electrÃ³nico\n"
+"    en el cuerpo del correo electrÃ³nico a la direcciÃ³n de correo "
+"electrÃ³nico\n"
 "siguiente:\n"
 "    bridges@xxxxxxxxxxxxxx\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "    TambiÃ©n es posible ir a buscar puentes con un navegador web en la "
@@ -577,16 +474,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    NOTA IMPORTANTE:\n"
@@ -599,13 +494,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "    Los paquetes pueden llegar fuera de orden! Por favor, asegÃºrese de que "
@@ -614,16 +507,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Gracias por su peticiÃ³n. QuedÃ³ entendido correctamente. Su solicitud "
@@ -633,16 +522,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "    Si no llega, el paquete podrÃa ser demasiado grande para su proveedor de "
@@ -654,15 +538,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "    Por desgracia estamos experimentando actualmente problemas y no podemos "
@@ -674,6 +554,41 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3) Renombre el archivo terminado en \".ex_RENAME\" a \".exe\" y tambiÃ©n "
+#~ "el que\n"
+#~ "termina en \".ex_RENAME.asc\" a \".exe.asc\".\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "SOPORTE\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
 #~ "\n"
 #~ "    Unfortunately, we won't answer you at this address. You should make\n"
@@ -681,10 +596,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -702,25 +619,29 @@ msgstr ""
 #~ "    hacer una cuenta con GMAIL.COM o YAHOO.CN y enviar el correo de\n"
 #~ "    uno de ellos.\n"
 #~ "\n"
-#~ "    SÃ³lo procesar las solicitudes de servicios de correo electrÃ³nico que el\n"
-#~ "     apoyo de \"DKIM\", que es una caracterÃstica de correo electrÃ³nico que "
-#~ "nos\n"
-#~ "    permite verificar que la direcciÃ³n en la \"De\" es en realidad el que lo "
-#~ "envÃa el\n"
+#~ "    SÃ³lo procesar las solicitudes de servicios de correo electrÃ³nico que "
+#~ "el\n"
+#~ "     apoyo de \"DKIM\", que es una caracterÃstica de correo electrÃ³nico "
+#~ "que nos\n"
+#~ "    permite verificar que la direcciÃ³n en la \"De\" es en realidad el que "
+#~ "lo envÃa el\n"
 #~ "     correo.\n"
 #~ "\n"
-#~ "    (Pedimos disculpas si no solicitan este tipo de correo electrÃ³nico. Dado "
-#~ "que\n"
-#~ "     el correo electrÃ³nico es de un servicio que no utiliza DKIM, estamos\n"
-#~ "     enviando una breve explicaciÃ³n, y luego vamos a ignorar esta direcciÃ³n "
-#~ "de\n"
+#~ "    (Pedimos disculpas si no solicitan este tipo de correo electrÃ³nico. "
+#~ "Dado que\n"
+#~ "     el correo electrÃ³nico es de un servicio que no utiliza DKIM, "
+#~ "estamos\n"
+#~ "     enviando una breve explicaciÃ³n, y luego vamos a ignorar esta "
+#~ "direcciÃ³n de\n"
 #~ "     correo electrÃ³nico para el dÃa siguiente mÃ¡s o menos.)\n"
 #~ "\n"
-#~ "    Tenga en cuenta que en la actualidad, no podemos procesar mensajes de\n"
+#~ "    Tenga en cuenta que en la actualidad, no podemos procesar mensajes "
+#~ "de\n"
 #~ "     correo electrÃ³nico HTML o en base 64 electrÃ³nicos. Usted tendrÃ¡ que "
 #~ "enviar\n"
 #~ "    texto sin formato.\n"
-#~ "    Si usted tiene alguna pregunta o no funciona, usted puede contactar a un\n"
+#~ "    Si usted tiene alguna pregunta o no funciona, usted puede contactar a "
+#~ "un\n"
 #~ "     humanos en esta direcciÃ³n de correo electrÃ³nico de apoyo:\n"
 #~ "     tor-assistants@xxxxxxxxxxxxxx\n"
 #~ "        "
@@ -793,7 +714,8 @@ msgstr ""
 #~ "tor-im-browser-bundle\n"
 #~ "source-bundle\n"
 #~ "\n"
-#~ "    Por favor, responda a este correo (a gettor@xxxxxxxxxxxxxx), y me dicen\n"
+#~ "    Por favor, responda a este correo (a gettor@xxxxxxxxxxxxxx), y me "
+#~ "dicen\n"
 #~ "    un nombre Ãºnico paquete en cualquier parte del cuerpo de su correo "
 #~ "electrÃ³nico.\n"
 #~ "\n"
diff --git a/i18n/et/gettor.po b/i18n/et/gettor.po
index 40b993b..ee1d9bc 100644
--- a/i18n/et/gettor.po
+++ b/i18n/et/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-04-10 13:50-0600\n"
 "Last-Translator: Heiki Ojasild <heiki.ojasild@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Tere, tegu on \"Hangi Tor\" robotiga.\n"
@@ -31,116 +30,78 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -151,270 +112,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:499
-msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/eu/gettor.po b/i18n/eu/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/eu/gettor.po
+++ b/i18n/eu/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/fa/gettor.po b/i18n/fa/gettor.po
index 8e64ee0..b368f76 100644
--- a/i18n/fa/gettor.po
+++ b/i18n/fa/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-11-04 13:40+0200\n"
 "Last-Translator: iranfree <green.dove88@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Ø³Ù?Ø§Ù?Ø?Ù?Ù? Ù¾Ø§Ø³Ø®Ú¯Ù?Û? Ø®Ù?Ø¯Ú©Ø§Ø± Ø¯Ø±Û?Ø§Ù?Øª ØªÙ?Ø± Ù?Ø³ØªÙ?.\n"
@@ -32,178 +30,155 @@ msgstr ""
 "Ø§Ø² Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§ Ø³Ù¾Ø§Ø³Ú¯Ø°Ø§Ø±Û?Ù?.\n"
 "\n"
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "n\\Ù?ØªØ§Ø³Ù?Ø§Ù?Ù? Ø§Ø² Ø§Ù?Ù? Ø¢Ø¯Ø±Ø³ Ø§Ù?Ú©Ø§Ù? Ù¾Ø§Ø³Ø® Ø¨Ù? Ø´Ù?Ø§ Ø±Ø§ Ù?Ø¯Ø§Ø±Ù?Ù?. Ù?Û? Ø¨Ø§Ù?Ø³Øª ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø±Û? Ø¯Ø± "
-"GMAIL.COMn\\ Ù? Ù?Ø§ Ø¯Ø±YAHOO.CN Ø¨Ø§Ø² Ú©Ù?Ù?Ø¯ Ù? Ø§Ø² Ù?Ú©Û? Ø§Ø² Ø§Ù?Ù? ØØ³Ø§Ø¨ Ù?Ø§Û? Ú©Ø§Ø±Ø¨Ø±Û? Ø¨Ø§ Ù?Ø§ "
-"n\\Ù?Ú©Ø§ØªØ¨Ù? Ú©Ù?Ù?Ø¯n\\    "
+"GMAIL.COMn\\ Ù? Ù?Ø§ Ø¯Ø±YAHOO.CN Ø¨Ø§Ø² Ú©Ù?Ù?Ø¯ Ù? Ø§Ø² Ù?Ú©Û? Ø§Ø² Ø§Ù?Ù? ØØ³Ø§Ø¨ Ù?Ø§Û? Ú©Ø§Ø±Ø¨Ø±Û? Ø¨Ø§ Ù?Ø§ n"
+"\\Ù?Ú©Ø§ØªØ¨Ù? Ú©Ù?Ù?Ø¯n\\    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
-"Ù?Ø§ ØªÙ?Ù?Ø§ Ø¨Ù? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù?Ø§Û?Û? Ù¾Ø§Ø³Ø® Ù?Û? Ø¯Ù?Û?Ù? Ú©Ù? Ø§Ø² ØØ³Ø§Ø¨ Ù?Ø§Û? Ú©Ø§Ø±Ø¨Ø±Û? ØÙ?Ø§Û?Øª Ø´Ø¯Ù? ØªÙ?Ø³Ø·\n "
-"\"DKIM\" Ø§Ø±Ø³Ø§Ù? Ø´Ø¯Ù? Ø§Ù?Ø¯. Ø§Û?Ù? ØØ³Ø§Ø¨ Ù?Ø§Û? Ú©Ø§Ø±Ø¨Ø±Û? Ø¨Ù? Ú¯Ù?Ù?Ù? Ø§Û? ØªÙ?Ø¸Û?Ù?  Ø´Ø¯Ù? Ø§Ù?Ø¯ Ú©Ù? \n"
-"Ù?Ø§Ø¯Ø±Ù?Ø¯ ØªØ¹Û?Û?Ù? Ú©Ù?Ù?Ø¯ Ø¢Ø¯Ø±Ø³Û? Ú©Ù? Ø¯Ø± \"From\" Ù?Ù?Ø´ØªÙ? Ø´Ø¯Ù? Ø§Ø³Øª Ù?Ù?Ø§Ù? Ø¢Ø¯Ø±Ø³Û? Ø§Ø³Øª Ú©Ù? Ø§Û?Ù?Û?Ù?\n "
-"Ø§Ø² Ø¢Ù?Ø¬Ø§ Ø§Ø±Ø³Ø§Ù? Ø´Ø¯Ù? Ø§Ø³Øª.\n "
-"\n"
+"Ù?Ø§ ØªÙ?Ù?Ø§ Ø¨Ù? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù?Ø§Û?Û? Ù¾Ø§Ø³Ø® Ù?Û? Ø¯Ù?Û?Ù? Ú©Ù? Ø§Ø² ØØ³Ø§Ø¨ Ù?Ø§Û? Ú©Ø§Ø±Ø¨Ø±Û? ØÙ?Ø§Û?Øª Ø´Ø¯Ù? ØªÙ?Ø³Ø·\n"
+" \"DKIM\" Ø§Ø±Ø³Ø§Ù? Ø´Ø¯Ù? Ø§Ù?Ø¯. Ø§Û?Ù? ØØ³Ø§Ø¨ Ù?Ø§Û? Ú©Ø§Ø±Ø¨Ø±Û? Ø¨Ù? Ú¯Ù?Ù?Ù? Ø§Û? ØªÙ?Ø¸Û?Ù?  Ø´Ø¯Ù? Ø§Ù?Ø¯ Ú©Ù? \n"
+"Ù?Ø§Ø¯Ø±Ù?Ø¯ ØªØ¹Û?Û?Ù? Ú©Ù?Ù?Ø¯ Ø¢Ø¯Ø±Ø³Û? Ú©Ù? Ø¯Ø± \"From\" Ù?Ù?Ø´ØªÙ? Ø´Ø¯Ù? Ø§Ø³Øª Ù?Ù?Ø§Ù? Ø¢Ø¯Ø±Ø³Û? Ø§Ø³Øª Ú©Ù? "
+"Ø§Û?Ù?Û?Ù?\n"
+" Ø§Ø² Ø¢Ù?Ø¬Ø§ Ø§Ø±Ø³Ø§Ù? Ø´Ø¯Ù? Ø§Ø³Øª.\n"
+" \n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
-"Ø§Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ø§Û?Ù? Ø§Û?Ù?Û?Ù? Ø¯Ø±Ø®Ù?Ø§Ø³ØªÛ? Ø§Ø±Ø§Ø¦Ù? Ù?Ú©Ø±Ø¯Ù? Ø¨Ù?Ø¯Û?Ø¯Ø? Ù¾Û?Ø´Ø§Ù¾Û?Ø´ Ø§Ø² Ø§Ø±Ø³Ø§Ù? Ø¢Ù?\n "
-"Ù¾Ù?Ø²Ø´ Ù?Û? Ø·Ù?Ø¨Û?Ù?. Ø§Ø² Ø¢Ù?Ø¬Ø§Û?Û? Ú©Ù? ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø±Û?/Ø§Û?Ù?Û?Ù? Ø´Ù?Ø§ Ø§Ø² Ø³Ø±Ù?Û?Ø³Û? Ù?Ø±Ø³ØªØ§Ø¯Ù? Ø´Ø¯Ù? Ú©Ù?\n "
-"Ø§Ø² Ø§Ù?Ú©Ø§Ù?Ø§Øª\"DKIM\" Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Ù?Û? Ú©Ù?Ø¯Ø? Ø±Ø§Ù?Ù?Ù?Ø§Û? Ù?Ø®ØªØµØ±Û? Ø¨Ø±Ø§Û? Ø´Ù?Ø§ Ù?Û? Ù?Ø±Ø³ØªÛ?Ù? Ù? Ø³Ù¾Ø³\n "
-"Ø§Û?Ù? Ø¢Ø¯Ø±Ø³ Ø§Û?Ù?Û?Ù? Ø±Ø§ Ø¯Ø± Ø·Ù?Ù? Ø±Ù?Ø² Ø¢Û?Ù?Ø¯Ù? Ù? Û?Ú©Û? Ø¯Ù? Ø±Ù?Ø² Ù¾Ø³ Ø§Ø² Ø¢Ù?Ø? Ø§Ø² Ø³Û?Ø³ØªÙ? Ø®Ø§Ø±Ø¬\n "
-"Ø®Ù?Ø§Ù?Û?Ù? Ú©Ø±Ø¯\n."
-"\n"
+"Ø§Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ø§Û?Ù? Ø§Û?Ù?Û?Ù? Ø¯Ø±Ø®Ù?Ø§Ø³ØªÛ? Ø§Ø±Ø§Ø¦Ù? Ù?Ú©Ø±Ø¯Ù? Ø¨Ù?Ø¯Û?Ø¯Ø? Ù¾Û?Ø´Ø§Ù¾Û?Ø´ Ø§Ø² Ø§Ø±Ø³Ø§Ù? Ø¢Ù?\n"
+" Ù¾Ù?Ø²Ø´ Ù?Û? Ø·Ù?Ø¨Û?Ù?. Ø§Ø² Ø¢Ù?Ø¬Ø§Û?Û? Ú©Ù? ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø±Û?/Ø§Û?Ù?Û?Ù? Ø´Ù?Ø§ Ø§Ø² Ø³Ø±Ù?Û?Ø³Û? Ù?Ø±Ø³ØªØ§Ø¯Ù? Ø´Ø¯Ù? Ú©Ù?\n"
+" Ø§Ø² Ø§Ù?Ú©Ø§Ù?Ø§Øª\"DKIM\" Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Ù?Û? Ú©Ù?Ø¯Ø? Ø±Ø§Ù?Ù?Ù?Ø§Û? Ù?Ø®ØªØµØ±Û? Ø¨Ø±Ø§Û? Ø´Ù?Ø§ Ù?Û? Ù?Ø±Ø³ØªÛ?Ù? Ù? "
+"Ø³Ù¾Ø³\n"
+" Ø§Û?Ù? Ø¢Ø¯Ø±Ø³ Ø§Û?Ù?Û?Ù? Ø±Ø§ Ø¯Ø± Ø·Ù?Ù? Ø±Ù?Ø² Ø¢Û?Ù?Ø¯Ù? Ù? Û?Ú©Û? Ø¯Ù? Ø±Ù?Ø² Ù¾Ø³ Ø§Ø² Ø¢Ù?Ø? Ø§Ø² Ø³Û?Ø³ØªÙ? Ø®Ø§Ø±Ø¬\n"
+" Ø®Ù?Ø§Ù?Û?Ù? Ú©Ø±Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
-"Ù?Ø·Ù?Ù? ØªÙ?Ø¬Ù? Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯ Ú©Ù? Ø¯Ø± ØØ§Ù? ØØ§Ø¶Ø± Ø§Ù?Ú©Ø§Ù? Ø¨Ú©Ø§Ø±Ú¯Û?Ø±Û? Ø§Û?Ù?Û?Ù? Ù?Ø§Û? HTML  Ù? Û?Ø§\n "
-"base 64  Ù?Ø¯Ø§Ø±Û?Ù?. Ø§Û?Ù?Û?Ù? Ù?Ø§Û? Ø®Ù?Ø¯ Ø±Ø§ ØµÙ?Ø±Øª plain-text Ø§Ø±Ø³Ø§Ù? Ù?Ù?Ø§Û?Û?Ø¯."
-"\n"
+"Ù?Ø·Ù?Ù? ØªÙ?Ø¬Ù? Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯ Ú©Ù? Ø¯Ø± ØØ§Ù? ØØ§Ø¶Ø± Ø§Ù?Ú©Ø§Ù? Ø¨Ú©Ø§Ø±Ú¯Û?Ø±Û? Ø§Û?Ù?Û?Ù? Ù?Ø§Û? HTML  Ù? Û?Ø§\n"
+" base 64  Ù?Ø¯Ø§Ø±Û?Ù?. Ø§Û?Ù?Û?Ù? Ù?Ø§Û? Ø®Ù?Ø¯ Ø±Ø§ ØµÙ?Ø±Øª plain-text Ø§Ø±Ø³Ø§Ù? Ù?Ù?Ø§Û?Û?Ø¯.\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
-"Ø§Ú¯Ø± Ø³Ù?Ø§Ù?Ù? Ø¯Ø§Ø±Ù?Ø¯ Ù?Ø§ Ø§Ù?Ù?Ù?Ù? Ø¨Ø±Ù?Ø§Ù?Ù? Ù?Ø§Ø± Ù?Ù?Ù?Ù?Ù?Ø¯Ø?Ù?Ù?ØªÙ?Ø§Ù?Ù?Ø¯ Ø¨Ø§ Ø§Ù?Ù?Ù?Ù? Ù¾Ø´ØªÙ?Ø¨Ø§Ù?Ù? Ø¨Ø§\n "
-"Ø¢Ø¯Ø±Ø³:tor-assistants@xxxxxxxxxxxxxx  Ø§Ù?Ù? ØªÙ?Ø§Ø³ Ø¨Ú¯Ù?Ø±Ù?\nØ¯"
-"\n"
+"Ø§Ú¯Ø± Ø³Ù?Ø§Ù?Ù? Ø¯Ø§Ø±Ù?Ø¯ Ù?Ø§ Ø§Ù?Ù?Ù?Ù? Ø¨Ø±Ù?Ø§Ù?Ù? Ù?Ø§Ø± Ù?Ù?Ù?Ù?Ù?Ø¯Ø?Ù?Ù?ØªÙ?Ø§Ù?Ù?Ø¯ Ø¨Ø§ Ø§Ù?Ù?Ù?Ù? Ù¾Ø´ØªÙ?Ø¨Ø§Ù?Ù? Ø¨Ø§\n"
+" Ø¢Ø¯Ø±Ø³:tor-assistants@xxxxxxxxxxxxxx  Ø§Ù?Ù? ØªÙ?Ø§Ø³ Ø¨Ú¯Ù?Ø±Ù?\n"
+"Ø¯\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
-"Ø§Ú¯Ø± ØªÙ?Ø¶Û?Ø Ø¨Ø¯Ù?Û?Ø¯ Ú©Ù? Ú©Ø¯Ø§Ù? Û?Ú© Ø§Ø² Ø¨Ø³ØªÙ? Ù?Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Tor Ù?Ù?Ø±Ø¯ Ù?Û?Ø§Ø² Ø´Ù?Ø§Ø³ØªØ? Ù?Ù? Ø¢Ù?\n "
-"Ø¨Ø³ØªÙ? Ø±Ø§ Ø¨Ø±Ø§Û? Ø´Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ù?Û? Ú©Ù?Ù?. Ù?Ø·Ù?Ù? Ø§Ø² Ù?Û?Ø§Ù? Ø¨Ø³ØªÙ? Ù?Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Ø²Û?Ø±Ø? Û?Ú©Û? Ø§Ø²\n "
-"Ù?Ø§Ù? Ù?Ø§ Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯\n."
-"\n"
+"Ø§Ú¯Ø± ØªÙ?Ø¶Û?Ø Ø¨Ø¯Ù?Û?Ø¯ Ú©Ù? Ú©Ø¯Ø§Ù? Û?Ú© Ø§Ø² Ø¨Ø³ØªÙ? Ù?Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Tor Ù?Ù?Ø±Ø¯ Ù?Û?Ø§Ø² Ø´Ù?Ø§Ø³ØªØ? Ù?Ù? Ø¢Ù?\n"
+" Ø¨Ø³ØªÙ? Ø±Ø§ Ø¨Ø±Ø§Û? Ø´Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ù?Û? Ú©Ù?Ù?. Ù?Ø·Ù?Ù? Ø§Ø² Ù?Û?Ø§Ù? Ø¨Ø³ØªÙ? Ù?Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Ø²Û?Ø±Ø? Û?Ú©Û? Ø§Ø²\n"
+" Ù?Ø§Ù? Ù?Ø§ Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
-"Ù?Ø·Ù?Ù? Ø¨Ù? Ø§Û?Ù? Ø§Û?Ù?Û?Ù? (gettor@xxxxxxxxxxxxxx)Ù¾Ø§Ø³Ø®Û? Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯ Ù? Ù?Ø§Ù? Û?Ú© Ø¨Ø³ØªÙ? Û?\n "
-"Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Ù?Ø§ØØ¯ Ø±Ø§ Ø¯Ø± Ù?Ø± Ú©Ø¬Ø§ Ø§Ø² Ø¨Ø¯Ù?Ù? Û? Ø§Û?Ù?Û?Ù? Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯\n."
-"\n"
+"Ù?Ø·Ù?Ù? Ø¨Ù? Ø§Û?Ù? Ø§Û?Ù?Û?Ù? (gettor@xxxxxxxxxxxxxx)Ù¾Ø§Ø³Ø®Û? Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯ Ù? Ù?Ø§Ù? Û?Ú© Ø¨Ø³ØªÙ? Û?\n"
+" Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Ù?Ø§ØØ¯ Ø±Ø§ Ø¯Ø± Ù?Ø± Ú©Ø¬Ø§ Ø§Ø² Ø¨Ø¯Ù?Ù? Û? Ø§Û?Ù?Û?Ù? Ù?Ø§Ø±Ø¯ Ú©Ù?Û?Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "Ø¯Ø±Û?Ø§Ù?Øª Ù?Ù?Ù?Ù?Ù? Ù?Ø§Û? Ù?ØÙ?Û? TOR\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
-"Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª ØªØ±Ø¬Ù?Ù? Ø§Û? Ø§Ø² Tor Ø¨Ù? Ø²Ø¨Ø§Ù? Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø± Ø´Ù?Ø§Ø? Ù?Ø·Ù?Ù? Ø²Ø¨Ø§Ù? Ù?Ø°Ú©Ù?Ø± Ù? Ø¢Ø¯Ø±Ø³Û? Ú©Ù?\n "
-"Ø¨Ù? Ø¢Ù? Ù?Û? Ø¨Ø§Û?Ø³Øª Ø§Ø±Ø³Ø§Ù? Ø´Ù?Ø¯ Ø±Ø§ Ù?Ø´Ø®Øµ Ú©Ù?Û?Ø¯.\n "
-"\n"
+"Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª ØªØ±Ø¬Ù?Ù? Ø§Û? Ø§Ø² Tor Ø¨Ù? Ø²Ø¨Ø§Ù? Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø± Ø´Ù?Ø§Ø? Ù?Ø·Ù?Ù? Ø²Ø¨Ø§Ù? Ù?Ø°Ú©Ù?Ø± Ù? Ø¢Ø¯Ø±Ø³Û? "
+"Ú©Ù?\n"
+" Ø¨Ù? Ø¢Ù? Ù?Û? Ø¨Ø§Û?Ø³Øª Ø§Ø±Ø³Ø§Ù? Ø´Ù?Ø¯ Ø±Ø§ Ù?Ø´Ø®Øµ Ú©Ù?Û?Ø¯.\n"
+" \n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
-"Ø§Û?Ù? Ù?Ù?Ù?Ù?Ù?Ø? ØØ§Ù?Û? ØªØ±Ø¬Ù?Ù? Û? Ø¨Ø³ØªÙ? Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Ù?Ù?Ø±Ø¯ Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§ Ø¨Ù? Ø²Ø¨Ø§Ù? Ú?Û?Ù?Û? Ø§Ø³Øª. Ø¯Ø±\n "
-"Ø²Û?Ø±Ø? Ù?Ù?Ø±Ø³ØªÛ? Ø§Ø² Ú©Ø¯Ù?Ø§Û? Ø²Ø¨Ø§Ù?Û? Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ø±Ø§ Ø®Ù?Ø§Ù?Û?Ø¯ Û?Ø§Ù?Øª\n."
-"\n"
+"Ø§Û?Ù? Ù?Ù?Ù?Ù?Ù?Ø? ØØ§Ù?Û? ØªØ±Ø¬Ù?Ù? Û? Ø¨Ø³ØªÙ? Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Ù?Ù?Ø±Ø¯ Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§ Ø¨Ù? Ø²Ø¨Ø§Ù? Ú?Û?Ù?Û? Ø§Ø³Øª. Ø¯Ø±\n"
+" Ø²Û?Ø±Ø? Ù?Ù?Ø±Ø³ØªÛ? Ø§Ø² Ú©Ø¯Ù?Ø§Û? Ø²Ø¨Ø§Ù?Û? Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ø±Ø§ Ø®Ù?Ø§Ù?Û?Ø¯ Û?Ø§Ù?Øª\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Ù?Ù?Ø±Ø³ØªÛ? Ø§Ø² Ù?Ù?Ø§Ø·Ù? ØªØØª Ù¾Ù?Ø´Ø´\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "Ø¯Ø± Ø§Û?Ù? Ø¨Ø®Ø´ Ù?Ù?Ø±Ø³ØªÛ? Ø§Ø² Ø²Ø¨Ø§Ù? Ù?Ø§Û? Ù?Ù?Ø¬Ù?Ø¯ Ø§Ø±Ø§Ø¦Ù? Ø´Ø¯Ù? Ø§Ø³Øª.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -214,9 +189,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: Ø¹Ø±Ø¨Ù?\n"
@@ -233,418 +206,354 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
-"Ø§Ú¯Ø± Ø²Ø¨Ø§Ù? Ø¯Û?Ú¯Ø±Û? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ù?Ú©Ù?Û?Ø¯Ø? Ù?Ù?Ù?Ù?Ù? Û? Ø§Ø±Ø³Ø§Ù?Û? Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ø´Ù?Ø§ Ø¨Ù? Ø²Ø¨Ø§Ù? Ø§Ù?Ú¯Ù?Û?Ø³Û?\n "
-"Ø®Ù?Ø§Ù?Ø¯ Ø¨Ù?Ø¯\n."
-"\n"
+"Ø§Ú¯Ø± Ø²Ø¨Ø§Ù? Ø¯Û?Ú¯Ø±Û? Ø±Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ù?Ú©Ù?Û?Ø¯Ø? Ù?Ù?Ù?Ù?Ù? Û? Ø§Ø±Ø³Ø§Ù?Û? Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ø´Ù?Ø§ Ø¨Ù? Ø²Ø¨Ø§Ù? Ø§Ù?Ú¯Ù?Û?Ø³Û?\n"
+" Ø®Ù?Ø§Ù?Ø¯ Ø¨Ù?Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "Ø¨Ø³ØªÙ? Ù?Ø§Û? Ø§Ø·Ù?Ø§Ø¹Ø§ØªÛ? Ú©Ù?Ú?Ú©-ØªØ±\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
-"Ø§Ú¯Ø± Ù¾Ù?Ù?Ø§Û? Ø¨Ø§Ù?Ø¯ Ø´Ù?Ø§ Ø¨Ù? Ú©Ù? Ø§Ø³Øª Ù? Û?Ø§ Ø³Ø±Ù?Û?Ø³ Ø¯Ù?Ù?Ø¯Ù? Ø§Ø¬Ø§Ø²Ù? Û? Ø¯Ø±Û?Ø§Ù?Øª Ø§Û?Ù?Û?Ù? Ø¨Ø§ Ø¶Ù?Û?Ù?Ù?\n "
-"Ù?Ø§Û? Ø¨Ø²Ø±Ú¯ Ø±Ø§ Ù?Ù?Û? Ø¯Ù?Ø¯Ø? Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ Ø§Ø² Ù?Ù?Ù?Ù?Ù? Ø§Û? Ø§Ø² GetTor Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯ Ú©Ù? Ø¨Ù? Ø´Ù?Ø§\n "
-"Ø§Ù?Ú©Ø§Ù? Ù?Û? Ø¯Ù?Ø¯ Ø¨Ù? Ø¬Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Û?Ú© Ø¶Ù?Û?Ù?Ù? Û? Ø¨Ø²Ø±Ú¯Ø? Ø¢Ù? Ø±Ø§ Ø¨Ù? ØµÙ?Ø±Øª Ú?Ù?Ø¯ Ø¶Ù?Û?Ù?Ù? Û? Ú©Ù?Ú?Ú©\n "
-"Ø¯Ø±Û?Ø§Ù?Øª Ú©Ù?Û?Ø¯\n."
-"\n"
+"Ø§Ú¯Ø± Ù¾Ù?Ù?Ø§Û? Ø¨Ø§Ù?Ø¯ Ø´Ù?Ø§ Ø¨Ù? Ú©Ù? Ø§Ø³Øª Ù? Û?Ø§ Ø³Ø±Ù?Û?Ø³ Ø¯Ù?Ù?Ø¯Ù? Ø§Ø¬Ø§Ø²Ù? Û? Ø¯Ø±Û?Ø§Ù?Øª Ø§Û?Ù?Û?Ù? Ø¨Ø§ Ø¶Ù?Û?Ù?Ù?\n"
+" Ù?Ø§Û? Ø¨Ø²Ø±Ú¯ Ø±Ø§ Ù?Ù?Û? Ø¯Ù?Ø¯Ø? Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ Ø§Ø² Ù?Ù?Ù?Ù?Ù? Ø§Û? Ø§Ø² GetTor Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯ Ú©Ù? Ø¨Ù? "
+"Ø´Ù?Ø§\n"
+" Ø§Ù?Ú©Ø§Ù? Ù?Û? Ø¯Ù?Ø¯ Ø¨Ù? Ø¬Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Û?Ú© Ø¶Ù?Û?Ù?Ù? Û? Ø¨Ø²Ø±Ú¯Ø? Ø¢Ù? Ø±Ø§ Ø¨Ù? ØµÙ?Ø±Øª Ú?Ù?Ø¯ Ø¶Ù?Û?Ù?Ù? Û? Ú©Ù?Ú?Ú©\n"
+" Ø¯Ø±Û?Ø§Ù?Øª Ú©Ù?Û?Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
-"ØªÙ?Ù?Ø§ Ú©Ø§Ø±Û? Ú©Ù? Ù?Ø§Ø²Ù? Ø§Ø³Øª Ø§Ù?Ø¬Ø§Ù? Ø¯Ù?Û?Ø¯ Ø§Û?Ù? Ø§Ø³Øª Ú©Ù? Ú©Ù?Ù?Ù? Ú©Ù?Û?Ø¯Û? \"split\" Ø±Ø§ Ø¯Ø± Ø¬Ø§Û?Û? Ø¯Ø±\n "
-"Ø¨Ø¯Ù?Ù? Ø§Û?Ù?Û?Ù? Ø®Ù?Ø¯Ø? Ø¨Ù? Ø§Û?Ù? ØµÙ?Ø±ØªØ? Ù?Ø±Ø§Ø± Ø¯Ù?Û?Ø¯\n:"
-"\n"
+"ØªÙ?Ù?Ø§ Ú©Ø§Ø±Û? Ú©Ù? Ù?Ø§Ø²Ù? Ø§Ø³Øª Ø§Ù?Ø¬Ø§Ù? Ø¯Ù?Û?Ø¯ Ø§Û?Ù? Ø§Ø³Øª Ú©Ù? Ú©Ù?Ù?Ù? Ú©Ù?Û?Ø¯Û? \"split\" Ø±Ø§ Ø¯Ø± Ø¬Ø§Û?Û? "
+"Ø¯Ø±\n"
+" Ø¨Ø¯Ù?Ù? Ø§Û?Ù?Û?Ù? Ø®Ù?Ø¯Ø? Ø¨Ù? Ø§Û?Ù? ØµÙ?Ø±ØªØ? Ù?Ø±Ø§Ø± Ø¯Ù?Û?Ø¯\n"
+":\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
-"Ø¯Ø± ØµÙ?Ø±Øª Ø§Ø±Ø³Ø§Ù? Ø§Û?Ù? Ù?ØªÙ? Ø¨Ù? GetTor Ø¨Ù? ØµÙ?Ø±Øª Ø§Û?Ù?Û?Ù?Ø? Ø¨Ø±Ø§Û? Ø´Ù?Ø§ Ø¨Ø³ØªÙ? Û? 1,4MB Ø¬Ø³ØªØ¬Ù?Û?\n "
-"Tor Ø§Ø±Ø³Ø§Ù? Ø®Ù?Ø§Ù?Ø¯ Ø´Ø¯."
-"\n"
+"Ø¯Ø± ØµÙ?Ø±Øª Ø§Ø±Ø³Ø§Ù? Ø§Û?Ù? Ù?ØªÙ? Ø¨Ù? GetTor Ø¨Ù? ØµÙ?Ø±Øª Ø§Û?Ù?Û?Ù?Ø? Ø¨Ø±Ø§Û? Ø´Ù?Ø§ Ø¨Ø³ØªÙ? Û? 1,4MB Ø¬Ø³ØªØ¬Ù?Û?\n"
+" Tor Ø§Ø±Ø³Ø§Ù? Ø®Ù?Ø§Ù?Ø¯ Ø´Ø¯.\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
-"Ù¾Ø³ Ø§Ø² Ø¯Ø±Û?Ø§Ù?Øª ØªÙ?Ø§Ù? Ù?Ø·Ø¹Ø§ØªØ? Ù?Û? Ø¨Ø§Û?Ø³Øª Ø¢Ù?Ù?Ø§ Ø±Ø§ Ø¨Ù? ØµÙ?Ø±Øª Û?Ú© Ø¨Ø³ØªÙ? Û? Ù?Ø§ØØ¯Ø? Ø¨Ø§Ø²Ù?ØµØ¨\n "
-"Ù?Ù?Ø§Û?Û?Ø¯. Ø±Ø§Ù?Ù?Ù?Ø§Û? Ø¨Ø§Ø²Ù?ØµØ¨Ø? Ø¯Ø± Ø²Û?Ø± Ø¢Ù?Ø¯Ù? Ø§Ø³Øª\n:"
-"\n"
+"Ù¾Ø³ Ø§Ø² Ø¯Ø±Û?Ø§Ù?Øª ØªÙ?Ø§Ù? Ù?Ø·Ø¹Ø§ØªØ? Ù?Û? Ø¨Ø§Û?Ø³Øª Ø¢Ù?Ù?Ø§ Ø±Ø§ Ø¨Ù? ØµÙ?Ø±Øª Û?Ú© Ø¨Ø³ØªÙ? Û? Ù?Ø§ØØ¯Ø? Ø¨Ø§Ø²Ù?ØµØ¨\n"
+" Ù?Ù?Ø§Û?Û?Ø¯. Ø±Ø§Ù?Ù?Ù?Ø§Û? Ø¨Ø§Ø²Ù?ØµØ¨Ø? Ø¯Ø± Ø²Û?Ø± Ø¢Ù?Ø¯Ù? Ø§Ø³Øª\n"
+":\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 ".) ØªÙ?Ø§Ù? Ù?Ø·Ø¹Ø§Øª Ø¯Ø±Û?Ø§Ù?ØªÛ? Ø±Ø§ Ø¯Ø± Û?Ú© Ù?Ù?Ù?Ø¯Ø±Ø? Ø±Ù?Û? Ø¯Û?Ø³Ú©Ø? Ø³Û?Ù? Ú©Ù?Û?Ø¯.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
 ".(ØªÙ?Ø§Ù? Ù¾Ø±Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø²Û?Ù¾ Ø´Ø¯Ù? Ø±Ø§ Ú©Ù? Ø¨Ù? z Ø®ØªÙ? Ù?Û? Ø´Ù?Ù?Ø¯Ø? Ø¯Ù?Ø¨Ø§Ø±Ù? Ø¬Ø¯Ø§Ø³Ø§Ø²Û? (unzip)\n"
-"Ú©Ù?Û?Ø¯. Ø§Ú¯Ø± Ù?Ù?Ù? Û? Ù¾Ø±Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø¶Ù?Û?Ù?Ù? Ø±Ø§ Ø¯Ø± Û?Ú© Ù?Ù?Ù?Ø¯Ø± Ø³Û?Ù? Ú©Ø±Ø¯Ù? Ø§Û?Ø¯Ø? ØªÙ?Ù?Ø§ Ú©Ø§Ø± Ù?Ø§Ø²Ù?\n "
-"Ø§Û?Ù? Ø§Ø³Øª Ø¢Ù? Ø§Ø³Øª Ú©Ù? Ù¾Ø±Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø¢Ù? Ù?Ù?Ù?Ø¯Ø± Ø±Ø§ Ø¬Ø¯Ø§Ø³Ø§Ø²Û? (unzip) Ú©Ù?Û?Ø¯.\n "
-"\n"
+"Ú©Ù?Û?Ø¯. Ø§Ú¯Ø± Ù?Ù?Ù? Û? Ù¾Ø±Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø¶Ù?Û?Ù?Ù? Ø±Ø§ Ø¯Ø± Û?Ú© Ù?Ù?Ù?Ø¯Ø± Ø³Û?Ù? Ú©Ø±Ø¯Ù? Ø§Û?Ø¯Ø? ØªÙ?Ù?Ø§ Ú©Ø§Ø± Ù?Ø§Ø²Ù?\n"
+" Ø§Û?Ù? Ø§Ø³Øª Ø¢Ù? Ø§Ø³Øª Ú©Ù? Ù¾Ø±Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø¢Ù? Ù?Ù?Ù?Ø¯Ø± Ø±Ø§ Ø¬Ø¯Ø§Ø³Ø§Ø²Û? (unzip) Ú©Ù?Û?Ø¯.\n"
+" \n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
-"3.) ØªÙ?Ø§Ù? Ù?Ø§Û?Ù?Ù?Ø§Û?Û? Ú©Ù? Ø¨Ù? \".x_RENAME\" Ø®ØªÙ? Ù?Û? Ø´Ù?Ù?Ø¯ Ø±Ø§ Ø¨Ù?  \".exe\" ØªØºÛ?Û?Ø± Ø¯Ù?Û?Ø¯ Ù?\n "
-"Ù?Ù?Ú?Ù?Û?Ù? Ù?Ø§Û?Ù?Û? Ú©Ù? Ø¨Ù? ex_RENAME.asc\" Ø®ØªÙ? Ø´Ø¯Ù? Ø±Ø§ Ø¨Ù? \"exe.asc\" ØªØºÛ?Û?Ø± Ø¯Ù?Û?Ø¯.\n "
-"\n"
+"4.) ØªÚ© ØªÚ© Ù¾Ø±Ù?Ù?Ø¯Ù? Ù?Ø§ Ø±Ø§ Ø¨Ù? ØªØ±ØªÛ?Ø¨Û? Ú©Ù? Ø¯Ø± Ù?ØªÙ? Ù?Ù?Ø±Ø§Ù? Ø¨Ø§ Ù?Ø± Ø¨Ø³ØªÙ? Û? Ø§Ø±Ø³Ø§Ù?Û? Ø´Ø±Ø\n"
+" Ø¯Ø§Ø¯Ù? Ø´Ø¯Ù?Ø? ØªØ§Û?Û?Ø¯ Ú©Ù?Û?Ø¯. (gpg --verify\n"
+")\n"
 "    "
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
-"4.) ØªÚ© ØªÚ© Ù¾Ø±Ù?Ù?Ø¯Ù? Ù?Ø§ Ø±Ø§ Ø¨Ù? ØªØ±ØªÛ?Ø¨Û? Ú©Ù? Ø¯Ø± Ù?ØªÙ? Ù?Ù?Ø±Ø§Ù? Ø¨Ø§ Ù?Ø± Ø¨Ø³ØªÙ? Û? Ø§Ø±Ø³Ø§Ù?Û? Ø´Ø±Ø\n "
-"Ø¯Ø§Ø¯Ù? Ø´Ø¯Ù?Ø? ØªØ§Û?Û?Ø¯ Ú©Ù?Û?Ø¯. (gpg --verify\n)"
-"\n"
+"5.) ØØ§Ù?Ø§ Ø§Ø² Ø¨Ø±Ù?Ø§Ù?Ù? Ø§Û? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯ Ú©Ù? Ø¢Ø±Ø´Û?Ù?Ù?Ø§Û? Ú?Ù?Ø¯Ø¨Ø®Ø´Û? RAR Ø±Ø§ Ø§Ø² Ù?Ø¶Ø¹Û?Øª rar\n"
+" Ø®Ø§Ø±Ø¬ Ù?Û? Ú©Ù?Ø¯. Ø§Ú¯Ø± Ø§Û?Ù? Ø¨Ø±Ù?Ø§Ù?Ù? Ø±Ø§ Ø±Ù?Û? Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø®Ù?Ø¯ Ù?ØµØ¨ Ù?Ú©Ø±Ø¯Ù? Ø§Û?Ø¯Ø? Ø§Ø² Ø§Û?Ù?Ø¬Ø§ Ù?Û?\n"
+" ØªÙ?Ø§Ù?Û?Ø¯ Ø¯Ø±Û?Ø§Ù?Øª Ú©Ù?Û?Ø¯:\n"
+" \n"
 "    "
 
-#: lib/gettor/constants.py:545
-msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
-"5.) ØØ§Ù?Ø§ Ø§Ø² Ø¨Ø±Ù?Ø§Ù?Ù? Ø§Û? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯ Ú©Ù? Ø¢Ø±Ø´Û?Ù?Ù?Ø§Û? Ú?Ù?Ø¯Ø¨Ø®Ø´Û? RAR Ø±Ø§ Ø§Ø² Ù?Ø¶Ø¹Û?Øª rar\n "
-"Ø®Ø§Ø±Ø¬ Ù?Û? Ú©Ù?Ø¯. Ø§Ú¯Ø± Ø§Û?Ù? Ø¨Ø±Ù?Ø§Ù?Ù? Ø±Ø§ Ø±Ù?Û? Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø®Ù?Ø¯ Ù?ØµØ¨ Ù?Ú©Ø±Ø¯Ù? Ø§Û?Ø¯Ø? Ø§Ø² Ø§Û?Ù?Ø¬Ø§ Ù?Û?\n "
-"ØªÙ?Ø§Ù?Û?Ø¯ Ø¯Ø±Û?Ø§Ù?Øª Ú©Ù?Û?Ø¯:\n "
-"\n"
+"Ø¨Ø±Ø§Û? Ù¾Û?Ø§Ø¯Ù?-Ø³Ø§Ø²Û? Ø¨Ø³ØªÙ? Û? Tor Ø®Ù?Ø¯Ø? Ú©Ø§Ù?Û? Ø§Ø³Øª Ø±Ù?Û? Ù¾Ø±Ù?Ù?Ø¯Ù? Û? \".exe\" Ø¯Ù?Ø¨Ø§Ø± Ú©Ù?Û?Ú©\n"
+" Ú©Ù?Û?Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
-"Ø¨Ø±Ø§Û? Ù¾Û?Ø§Ø¯Ù?-Ø³Ø§Ø²Û? Ø¨Ø³ØªÙ? Û? Tor Ø®Ù?Ø¯Ø? Ú©Ø§Ù?Û? Ø§Ø³Øª Ø±Ù?Û? Ù¾Ø±Ù?Ù?Ø¯Ù? Û? \".exe\" Ø¯Ù?Ø¨Ø§Ø± Ú©Ù?Û?Ú©\n "
-"Ú©Ù?Û?Ø¯\n."
-"\n"
+"Ù¾Ø³ Ø§Ø² Ø§ØªÙ?Ø§Ù? Ù¾Û?Ø§Ø¯Ù?-Ø³Ø§Ø²Û?Ø? Ø¨Ø§Û?Ø¯ Ù?Ø§Û?Ù? Ø¬Ø¯Û?Ø¯Û? Ø±Ø§ Ø¯Ø± Ù?Ù?Ù?Ø¯Ø± Ù?Ø±Ø¨Ù?Ø· Ù¾Û?Ø¯Ø§ Ú©Ù?Û?Ø¯. Ú©Ø§Ù?Û?\n"
+" Ø§Ø³Øª Ø±Ù?Û? Ø¢Ù? Ø¯Ù?Ø¨Ø§Ø± Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ ØªØ§ Tor Browser Bundle Ø¯Ø± Ø¹Ø±Ø¶ Ú?Ù?Ø¯ Ø«Ø§Ù?Û?Ù? Ù?Ø¹Ø§Ù? Ø´Ù?Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
-"Ù¾Ø³ Ø§Ø² Ø§ØªÙ?Ø§Ù? Ù¾Û?Ø§Ø¯Ù?-Ø³Ø§Ø²Û?Ø? Ø¨Ø§Û?Ø¯ Ù?Ø§Û?Ù? Ø¬Ø¯Û?Ø¯Û? Ø±Ø§ Ø¯Ø± Ù?Ù?Ù?Ø¯Ø± Ù?Ø±Ø¨Ù?Ø· Ù¾Û?Ø¯Ø§ Ú©Ù?Û?Ø¯. Ú©Ø§Ù?Û?\n "
-"Ø§Ø³Øª Ø±Ù?Û? Ø¢Ù? Ø¯Ù?Ø¨Ø§Ø± Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ ØªØ§ Tor Browser Bundle Ø¯Ø± Ø¹Ø±Ø¶ Ú?Ù?Ø¯ Ø«Ø§Ù?Û?Ù? Ù?Ø¹Ø§Ù? Ø´Ù?Ø¯\n."
-"\n"
+"7.) Ú©Ø§Ø± Ø´Ù?Ø§ Ø¨Ø§ Ù?Ù?Ù?Ù?Û?Øª Ø¨Ù? Ù¾Ø§Û?Ø§Ù? Ø±Ø³Û?Ø¯. Ù?ØªØ´Ú©Ø±Û?Ù? Ú©Ù? Ø§Ø² Tor Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û? Ú©Ù?Û?Ø¯. Ø´Ø§Ø¯\n"
+" Ø¨Ø§Ø´Û?Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"7.) Ú©Ø§Ø± Ø´Ù?Ø§ Ø¨Ø§ Ù?Ù?Ù?Ù?Û?Øª Ø¨Ù? Ù¾Ø§Û?Ø§Ù? Ø±Ø³Û?Ø¯. Ù?ØªØ´Ú©Ø±Û?Ù? Ú©Ù? Ø§Ø² Tor Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ù?Û? Ú©Ù?Û?Ø¯. Ø´Ø§Ø¯\n "
-"Ø¨Ø§Ø´Û?Ø¯\n."
-"\n"
-"    "
 
-#: lib/gettor/constants.py:569
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
-"Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û?\n"
-"\n"
+"Ø¨Ø³ØªÙ? Û? Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø± Ø¯Ø±Ø®Ù?Ø§Ø³ØªÛ? Ø´Ù?Ø§ Ø¨Ù? ØµÙ?Ø±Øª Ù?Ø§Û?Ù? Ø²Û?Ù¾ Ø´Ø¯Ù?Ø? Ø¢Ù?Ø§Ø¯Ù? Ø§Ø³Øª. Ù?Ø·Ù?Ù? Ø¨Ø³ØªÙ? Ø±Ø§\n"
+" Ø¬Ø¯Ø§Ø³Ø§Ø²Û? (unzip) Ú©Ù?Û?Ø¯ Ù? Ø§Ù?Ø¶Ø§Û? Ø¢Ù? Ø±Ø§ ØªØ§Û?Û?Ø¯ Ú©Ù?Û?Ø¯.\n"
+" \n"
 "    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\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:"
 msgstr ""
 "\n"
-"Ø¨Ø³ØªÙ? Û? Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø± Ø¯Ø±Ø®Ù?Ø§Ø³ØªÛ? Ø´Ù?Ø§ Ø¨Ù? ØµÙ?Ø±Øª Ù?Ø§Û?Ù? Ø²Û?Ù¾ Ø´Ø¯Ù?Ø? Ø¢Ù?Ø§Ø¯Ù? Ø§Ø³Øª. Ù?Ø·Ù?Ù? Ø¨Ø³ØªÙ? Ø±Ø§\n "
-"Ø¬Ø¯Ø§Ø³Ø§Ø²Û? (unzip) Ú©Ù?Û?Ø¯ Ù? Ø§Ù?Ø¶Ø§Û? Ø¢Ù? Ø±Ø§ ØªØ§Û?Û?Ø¯ Ú©Ù?Û?Ø¯.\n "
-"\n"
+"Ø§Ø´Ø§Ø±Ù?: Ø§Ú¯Ø± GnuPG Ø±Ù?Û? Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø´Ù?Ø§ Ù?ØµØ¨ Ø´Ø¯Ù? Ø§Ø³ØªØ? Ø§Ø² Ø¹Ø¨Ø§Ø±Øª Ù?Ø±Ù?Ø§Ù?Û? gpg Ø¨Ù? "
+"ØªØ±ØªÛ?Ø¨Û?\n"
+" Ú©Ù? Ø¯Ø± Ø²Û?Ø± Ø´Ø±Ø Ø¯Ø§Ø¯Ù? Ø´Ø¯Ù?Ø? Ø¨Ø¹Ø¯ Ø§Ø² Ø¬Ø¯Ø§Ø³Ø§Ø²Û? (unzip) Ù¾Ø±Ù?Ù?Ø¯Ù?Ø? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯\n"
+".\n"
 "    "
 
-#: lib/gettor/constants.py:585
-msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Ø§Ø´Ø§Ø±Ù?: Ø§Ú¯Ø± GnuPG Ø±Ù?Û? Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø´Ù?Ø§ Ù?ØµØ¨ Ø´Ø¯Ù? Ø§Ø³ØªØ? Ø§Ø² Ø¹Ø¨Ø§Ø±Øª Ù?Ø±Ù?Ø§Ù?Û? gpg Ø¨Ù? ØªØ±ØªÛ?Ø¨Û?\n "
-"Ú©Ù? Ø¯Ø± Ø²Û?Ø± Ø´Ø±Ø Ø¯Ø§Ø¯Ù? Ø´Ø¯Ù?Ø? Ø¨Ø¹Ø¯ Ø§Ø² Ø¬Ø¯Ø§Ø³Ø§Ø²Û? (unzip) Ù¾Ø±Ù?Ù?Ø¯Ù?Ø? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯\n."
-"\n"
-"    "
-
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "Ù?ØªÛ?Ø¬Ù? Ù?Ù?Ø§Û?Û? Ø¨Ø§Û?Ø¯ Ú?Û?Ø²Û? Ø´Ø¨Û?Ù? Ø¨Ù? Ø§Û?Ù? Ø¨Ø§Ø´Ø¯:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
-"Ø§Ú¯Ø± Ø¨Ø§ Ø§Ø¨Ø²Ø§Ø± Ù?Ø±Ù?Ø§Ù?Û? Ø¢Ø´Ù?Ø§Û?Û? Ù?Ø¯Ø§Ø±Û?Ø¯Ø? Ø±Ù?Û? Ø§Û?Ù?ØªØ±Ù?Øª Ø¨Ù? Ø¯Ù?Ø¨Ø§Ù? Û?Ú© Ú©Ø§Ø±Ø¨Ø± Ú¯Ø±Ø§Ù?Û?Ú©Û?\n "
-"Ø±Ø§Ø¨Ø· Ù?Ù?Ø§Ø³Ø¨ Ø¨Ø±Ø§Û? GunPG Ø¨Ú¯Ø±Ø¯Û?Ø¯\n"
+"Ø§Ú¯Ø± Ø¨Ø§ Ø§Ø¨Ø²Ø§Ø± Ù?Ø±Ù?Ø§Ù?Û? Ø¢Ø´Ù?Ø§Û?Û? Ù?Ø¯Ø§Ø±Û?Ø¯Ø? Ø±Ù?Û? Ø§Û?Ù?ØªØ±Ù?Øª Ø¨Ù? Ø¯Ù?Ø¨Ø§Ù? Û?Ú© Ú©Ø§Ø±Ø¨Ø± Ú¯Ø±Ø§Ù?Û?Ú©Û?\n"
+" Ø±Ø§Ø¨Ø· Ù?Ù?Ø§Ø³Ø¨ Ø¨Ø±Ø§Û? GunPG Ø¨Ú¯Ø±Ø¯Û?Ø¯\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Ø§Ú¯Ø± Ø³Ø±Ù?Û?Ø³ Ø§Û?Ù?ØªØ±Ù?ØªÛ? Ø´Ù?Ø§ Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ø´Ø¨Ú©Ù? Tor Ø±Ø§ Ù?Ø³Ø¯Ù?Ø¯ Ù?Û? Ú©Ù?Ø¯Ø? Ø¨Ù? Û?Ú© Ø±Ø§Ø¨Ø·/Ù¾Ù? \n"
 "Ø¨Ø§Ø²Ù¾Ø®Ø´ Ù?Û?Ø§Ø² Ø®Ù?Ø§Ù?Û?Ø¯ Ø¯Ø§Ø´Øª. Ù¾Ù? Ø¨Ø§Ø²Ù¾Ø®Ø´ (Û?Ø§ Ø´Ú©Ù? Ú©Ù?ØªØ§Ù? Ø´Ø¯Ù? Û? Ø¢Ù?Ø? \"Ù¾Ù?\") Ø§Ø² Ø¬Ù?Ù?Ù? \n"
 "Ø¨Ø§Ø²Ù¾Ø®Ø´ Ù?Ø§Û? Tor Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¯Ø± Ù?Ù?Ø±Ø³Øª Ø§ØµÙ?Û? Ù?Ø§Ø±Ø¯ Ù?Ø´Ø¯Ù? Ø§Ù?Ø¯. Ø§Ø² Ø¢Ù?Ø¬Ø§Û?Û? Ú©Ù? Û?Ú© Ù?Û?Ø³Øª \n"
 "Ø¹Ù?Ù?Ù?Û? Ú©Ø§Ù?Ù? Ø§Ø² Ø§Û?Ù? Ø§Ø¨Ø²Ø§Ø± Ù?Ù?Ø¬Ù?Ø¯ Ù?Û?Ø³ØªØ? ØØªÛ? Ø§Ú¯Ø± ISP Ø´Ù?Ø§ Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ Ø¨Ø§Ø²Ù¾Ø®Ø´ Ù?Ø§Û? \n"
-"Ø´Ù?Ø§Ø®ØªÙ? Ø´Ø¯Ù? Û? Tor Ù?Ø³Ø¯Ù?Ø¯ Ù?Û? Ú©Ù?Ø¯Ø? Ø§Ù?Ø§ Ø¨Ù? Ø§ØØªÙ?Ø§Ù? Ø²Û?Ø§Ø¯ Ù?Ø§Ø¯Ø± Ø¨Ù? Ù?Ø³Ø¯Ù?Ø¯ Ú©Ø±Ø¯Ù? ØªÙ?Ø§Ù? Ù¾Ù? \n"
+"Ø´Ù?Ø§Ø®ØªÙ? Ø´Ø¯Ù? Û? Tor Ù?Ø³Ø¯Ù?Ø¯ Ù?Û? Ú©Ù?Ø¯Ø? Ø§Ù?Ø§ Ø¨Ù? Ø§ØØªÙ?Ø§Ù? Ø²Û?Ø§Ø¯ Ù?Ø§Ø¯Ø± Ø¨Ù? Ù?Ø³Ø¯Ù?Ø¯ Ú©Ø±Ø¯Ù? ØªÙ?Ø§Ù? "
+"Ù¾Ù? \n"
 "Ù?Ø§ Ù?Ø®Ù?Ø§Ù?Ø¯ Ø¨Ù?Ø¯. \n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
-"Ø¨Ø§ Ø§Ø±Ø³Ø§Ù? Û?Ú© Ø§Û?Ù?Û?Ù? Ø¨Ù? Ø¢Ø¯Ø±Ø³: bridges@xxxxxxxxxxxxxx Ú©Ù? Ú©Ù?Ù?Ù? Û? \"get bridge\" Ø±Ø§ \n"
+"Ø¨Ø§ Ø§Ø±Ø³Ø§Ù? Û?Ú© Ø§Û?Ù?Û?Ù? Ø¨Ù? Ø¢Ø¯Ø±Ø³: bridges@xxxxxxxxxxxxxx Ú©Ù? Ú©Ù?Ù?Ù? Û? \"get bridge\" "
+"Ø±Ø§ \n"
 "Ø¯Ø± Ø¨Ø¯Ù?Ù? Û? Ø§Û?Ù?Û?Ù? Ù?Ø§Ø±Ø¯ Ú©Ø±Ø¯Ù? Ø¨Ø§Ø´Û?Ø¯Ø? Ù¾Ù? Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø± Ø±Ø§ Ø¯Ø±Û?Ø§Ù?Øª Ú©Ù?Û?Ø¯.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "/nÙ?Ù?Ú?Ù?Ù?Ù? Ø§Ù?Ù? Ø§Ù?Ù?Ø§Ù? Ù?Ø¬Ù?Ø¯ Ø¯Ø§Ø±Ø¯ Ù?Ù? Ù?Ù? Ù¾Ù? Ø±Ø§ Ù?Ø§Ù?Ù?Ø¯ Ø§Ù?Ú¯Ù?Ù? Ø²Ù?Ø± Ø¯Ø± Ù?Ø±Ù?Ú¯Ø± Ø§Ø³ØªÙ?Ø§Ø¯Ù? "
-"Ù?Ù?Ù?Ø¯/n\\url: https://bridges.torproject.org//n";
-"\n"
+"Ù?Ù?Ù?Ø¯/n\\url: https://bridges.torproject.org//n\n";
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "/nØ§Ø·Ù?Ø§Ø¹Ù?Ù? Ù?Ù?Ù?: Ø§Ø² Ø¢Ù?Ø¬Ø§Ù?Û? Ú©Ù? Ø§Ù?Ù? Ø¨Ø®Ø´ Ø¬Ø²Ù? Ø¯Ø±Ø®Ù?Ø§Ø³Øª \"Ù?Ø§Ù?Ù? Ú?Ù?Ø¯Ø¨Ø®Ø´Û?\" Ø§Ø³ØªØ? Ø¨Ø§Ù?Ø¯ "
 "Ù?Ù?ØªØ¸Ø± Ø¯Ø±Ù?Ø§Ù?Øª ØªÙ?Ø§Ù? Ù?Ø§Ù?Ù? Ù?Ø§ Ø¨Ù?Ø§Ù?Ù?Ø¯ Ù? Ù?Ù?Ù? Ø±Ø§ Ø¨Ø§ Ù?Ù? Ø¯Ø± Ù?Ú© Ù?Ù?Ø±Ø³Øª (Directory) Ø³Ù?Ù? "
-"Ú©Ù?Ù?Ø¯  Ù? Ø¨Ø§ Ø¯Ù?Ú©Ù?Ù?Ú© Ø±Ù?Û? Ù?Ø§Û?Ù? Ø§Ù?Ù?Ø? Ù?Ù?Ù? Ø±Ø§ Ø¨Ø§ Ù?Ù? Ù¾Ù?Ø§Ø¯Ù?-Ø³Ø§Ø²Û?(unpack) Ú©Ù?Ù?Ø¯./n"
-"\n"
+"Ú©Ù?Ù?Ø¯  Ù? Ø¨Ø§ Ø¯Ù?Ú©Ù?Ù?Ú© Ø±Ù?Û? Ù?Ø§Û?Ù? Ø§Ù?Ù?Ø? Ù?Ù?Ù? Ø±Ø§ Ø¨Ø§ Ù?Ù? Ù¾Ù?Ø§Ø¯Ù?-Ø³Ø§Ø²Û?(unpack) Ú©Ù?Ù?Ø¯./n\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "/nÙ?Ù?Ú©Ù? Ø§Ø³Øª Ú©Ù? Ø¨Ø³ØªÙ? Ù?Ø§ Ø¨Ø¯Ù?Ù? ØªØ±ØªÙ?Ø¨ Ø§Ø±Ø³Ø§Ù? Ø´Ù?Ù?Ø¯! Ù?Ø·Ù?Ù? Ù¾Ù?Ø´ Ø§Ø² Ø¯Ø±Ù?Ø§Ù?Øª Ù?Ù?Ù? Ø¨Ø³ØªÙ? Ù?Ø§Ø? "
-"Ø§Ù?Ø¯Ø§Ù? Ø¨Ù? Ù¾Ù?Ø§Ø¯Ù?-Ø³Ø§Ø²Û? (unpack) Ù?Ø§Ù?Ù? Ù?Ø§ Ù?Ú©Ù?Ù?Ø¯./n"
-"\n"
+"Ø§Ù?Ø¯Ø§Ù? Ø¨Ù? Ù¾Ù?Ø§Ø¯Ù?-Ø³Ø§Ø²Û? (unpack) Ù?Ø§Ù?Ù? Ù?Ø§ Ù?Ú©Ù?Ù?Ø¯./n\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "/nØ¨Ø§ ØªØ´Ú©Ø± Ø§Ø² Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§Ø? Ø¢Ù?Ú?Ù? Ø³Ù?Ø§Ø±Ø´ Ø¯Ø§Ø¯Ù? Ø§Ù?Ø¯ Ø¨Ù? Ø·Ù?Ø± Ú©Ø§Ù?Ù? Ù?Ù?Ù?Ù?Ø¯Ù? Ø´Ø¯Ø? Ù? Ø¯Ø± "
-"ØØ§Ù? ØªØ¯Ø§Ø±Ú© Ø§Ø³Øª. Ø¨Ø³ØªÙ? Ø¯Ø±Ø®Ù?Ø§Ø³ØªÛ? Ù?Û? Ø¨Ø§Ù?Ø³Øª ØªØ§ Ø¯Ù? Ø¯Ù?Ù?Ù?Ù? Ø¢Ù?Ù?Ø¯Ù? Ø¨Ù? Ø¯Ø³Øª Ø´Ù?Ø§ Ø¨Ø±Ø³Ø¯./n"
-"\n"
+"ØØ§Ù? ØªØ¯Ø§Ø±Ú© Ø§Ø³Øª. Ø¨Ø³ØªÙ? Ø¯Ø±Ø®Ù?Ø§Ø³ØªÛ? Ù?Û? Ø¨Ø§Ù?Ø³Øª ØªØ§ Ø¯Ù? Ø¯Ù?Ù?Ù?Ù? Ø¢Ù?Ù?Ø¯Ù? Ø¨Ù? Ø¯Ø³Øª Ø´Ù?Ø§ Ø¨Ø±Ø³Ø¯./n\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "/nØ§Ú¯Ø± Ø¨Ø³ØªÙ? Ø§Ø±Ø³Ø§Ù? Ù?Ø´Ø¯Ù?Ø? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Ù? Ø¹Ù?Øª ØØ¬Ù? Ø¨Ø§Ù?Ø§Û? Ø¨Ø³ØªÙ? Ù? Ø¹Ø¯Ù? ØªÙ?Ø§Ù?Ø§Ù?Û? Ø³Ø±Ù?Ù?Ø³ "
 "Ø¯Ù?Ù?Ø¯Ù? Mail  Ø¨Ø±Ø§Û? Ø§Ø±Ø³Ø§Ù? Ø¢Ù? Ø¨Ø§Ø´Ø¯. Ù?Ø¬Ø¯Ø¯Ø§ Ø¨Ø§ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ø³Ø±Ù?Ù?Ø³ Ù?Ø§Ù?Û? Ù?Ø§Ù?Ù?Ø¯ yahoo \n"
 "Ù?Ø§ gmail Ø§Ù?Ù?Ù?Ù? Ø§Ø±Ø³Ø§Ù? Ù?Ù?Ø§Ù?Ù?Ø¯ Ù? Ù?Ø§ Ø§Ù?Ù?Ú©Ù? Ø¨Ù? Ø¬Ø§Û? tor-im-browser-bundle Ø¨Ø±Ø§Û? \n"
 "Ø¯Ø±Ù?Ø§Ù?Øª tor-browser-bundle Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø¨Ù?Ø±Ø³ØªÙ?Ø¯ Ú?Ø±Ø§ Ú©Ù? Ø§Ø² ØØ¬Ù? Ù¾Ø§Ù?Ù?Ù?ØªØ±Û? Ø¨Ø±Ø®Ù?Ø±Ø¯Ø§Ø± \n"
-"Ø§Ø³Øª./n"
-"\n"
+"Ø§Ø³Øª./n\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "/nÙ?ØªØ§Ø³Ù?Ø§Ù?Ù? Ø¯Ø± ØØ§Ù? ØØ§Ø¶Ø± Ø¨Ø§ Ù?Ø´Ú©Ù? Ù?Ù?Ø§Ø¬Ù? Ù?Ø³ØªÙ?Ù? Ù? Ø§Ù?Ú©Ø§Ù? Ø±Ø³Ù?Ø¯Ú¯Û? Ù?Ù?Ø±Û? Ø¨Ù? Ø¯Ø±Ø®Ù?Ø§Ø³Øª "
-"Ø´Ù?Ø§ Ø±Ø§ Ù?Ø¯Ø§Ø±Ù?Ù? Ø§Ù?Ø§ Ø¯Ø± ØØ§Ù? Ø±Ù?Ø¹ Ø§Ù?Ù? Ù?Ø´Ú©Ù? Ù?Ø³ØªÙ?Ù?Ø? Ø®Ù?Ø§Ù?Ø´ Ù?Û? Ú©Ù?Ù?Ù? ØµØ¨Ù?Ø± Ø¨Ø§Ø´Ù?Ø¯./n"
-"\n"
+"Ø´Ù?Ø§ Ø±Ø§ Ù?Ø¯Ø§Ø±Ù?Ù? Ø§Ù?Ø§ Ø¯Ø± ØØ§Ù? Ø±Ù?Ø¹ Ø§Ù?Ù? Ù?Ø´Ú©Ù? Ù?Ø³ØªÙ?Ù?Ø? Ø®Ù?Ø§Ù?Ø´ Ù?Û? Ú©Ù?Ù?Ù? ØµØ¨Ù?Ø± Ø¨Ø§Ø´Ù?Ø¯./n\n"
 "    "
 
 #~ msgid ""
 #~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3.) ØªÙ?Ø§Ù? Ù?Ø§Û?Ù?Ù?Ø§Û?Û? Ú©Ù? Ø¨Ù? \".x_RENAME\" Ø®ØªÙ? Ù?Û? Ø´Ù?Ù?Ø¯ Ø±Ø§ Ø¨Ù?  \".exe\" ØªØºÛ?Û?Ø± "
+#~ "Ø¯Ù?Û?Ø¯ Ù?\n"
+#~ " Ù?Ù?Ú?Ù?Û?Ù? Ù?Ø§Û?Ù?Û? Ú©Ù? Ø¨Ù? ex_RENAME.asc\" Ø®ØªÙ? Ø´Ø¯Ù? Ø±Ø§ Ø¨Ù? \"exe.asc\" ØªØºÛ?Û?Ø± "
+#~ "Ø¯Ù?Û?Ø¯.\n"
+#~ " \n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û?\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
 #~ "\n"
 #~ "    Unfortunately, we won't answer you at this address. You should make\n"
@@ -652,10 +561,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -672,18 +583,18 @@ msgstr ""
 #~ "GMAIL.COM Û?Ø§ Ø¯Ø± YAHOO.CN ØØ³Ø§Ø¨ Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? Ù? Ø§Ø² Ø·Ø±Û?Ù? Û?Ú©Û? Ø§Ø² Ø¢Ù? Ø¢Ø¯Ø±Ø³Ù?Ø§ Ø¨Ø§ Ù?Ø§ "
 #~ "Ù?Ú©Ø§ØªØ¨Ù? Ú©Ù?Û?Ø¯.\n"
 #~ "\n"
-#~ "Ù?Ø§ Ù?Ù?Ø· Ø¯Ø±Ø®Ù?Ø§Ø³ØªÙ?Ø§Û?Û? Ø±Ø§ Ù?Ù?Ø±Ø¯ Ø¨Ø±Ø±Ø³Û? Ù?Ø±Ø§Ø± Ù?Û? Ø¯Ù?Û?Ù? Ú©Ù? Ø³Ø±Ù?Û?Ø³ Ù¾Ø³Øª Ø§Ù?Ú©ØªØ±Ù?Ù?Û?Ú©Û? Ø¢Ù?Ù?Ø§ "
-#~ "\"DKIM\" Ø±Ø§ Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ú©Ù?Ø¯. \"DKIM\" Ø§Û?Ù? Ø§Ù?Ú©Ø§Ù? Ø±Ø§ Ø¨Ù? Ù?Ø§ Ù?Û? Ø¯Ù?Ø¯ ØªØ§ Ø§Ø·Ù?Û?Ù?Ø§Ù? Û?Ø§Ø¨Û?Ù? Ú©Ù? "
-#~ "Ø¢Ø¯Ø±Ø³ Ù?Ù?Ø¯Ø±Ø¬ Ø¯Ø± Ù?Ø³Ù?Øª  \"From\"Ø? Ù?Ù?Ø§Ù? Ø¢Ø¯Ø±Ø³Û? Ø§Ø³Øª Ú©Ù? Ù?Ø§Ù?Ù? Ø§Ø² Ø¢Ù? Ø¨Ù? Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ø´Ø¯Ù? "
-#~ "Ø§Ø³Øª. \n"
+#~ "Ù?Ø§ Ù?Ù?Ø· Ø¯Ø±Ø®Ù?Ø§Ø³ØªÙ?Ø§Û?Û? Ø±Ø§ Ù?Ù?Ø±Ø¯ Ø¨Ø±Ø±Ø³Û? Ù?Ø±Ø§Ø± Ù?Û? Ø¯Ù?Û?Ù? Ú©Ù? Ø³Ø±Ù?Û?Ø³ Ù¾Ø³Øª Ø§Ù?Ú©ØªØ±Ù?Ù?Û?Ú©Û? "
+#~ "Ø¢Ù?Ù?Ø§ \"DKIM\" Ø±Ø§ Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ú©Ù?Ø¯. \"DKIM\" Ø§Û?Ù? Ø§Ù?Ú©Ø§Ù? Ø±Ø§ Ø¨Ù? Ù?Ø§ Ù?Û? Ø¯Ù?Ø¯ ØªØ§ "
+#~ "Ø§Ø·Ù?Û?Ù?Ø§Ù? Û?Ø§Ø¨Û?Ù? Ú©Ù? Ø¢Ø¯Ø±Ø³ Ù?Ù?Ø¯Ø±Ø¬ Ø¯Ø± Ù?Ø³Ù?Øª  \"From\"Ø? Ù?Ù?Ø§Ù? Ø¢Ø¯Ø±Ø³Û? Ø§Ø³Øª Ú©Ù? Ù?Ø§Ù?Ù? Ø§Ø² "
+#~ "Ø¢Ù? Ø¨Ù? Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ø´Ø¯Ù? Ø§Ø³Øª. \n"
 #~ "\n"
 #~ "(Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ø¹Ø°Ø±Ø®Ù?Ø§Ù?Û? Ù?Ø§ Ø±Ø§ Ù¾Ø°Û?Ø±Ø§ Ø¨Ø§Ø´Û?Ø¯. Ø§Ø² Ø¢Ù?Ø¬Ø§Û?Û?Ú©Ù? Ø§Û?Ù?Û?Ù? Ø´Ù?Ø§ DKIM Ø±Ø§ "
 #~ "Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ù?Ù?Û? Ú©Ù?Ø¯Ø? Ù?Ø§ Ø§Û?Ù? ØªÙ?Ø¶Û?Ø Ú©Ù?ØªØ§Ù? Ø±Ø§ Ø§Ø±Ø³Ø§Ù? Ù?Ù?Ù?Ø¯Ù? Ù? Ø§Û?Ù? Ø¢Ø¯Ø±Ø³ Ø§Û?Ù?Û?Ù? Ø±Ø§ "
 #~ "Ø¨Ø²Ù?Ø¯Û? Ø§Ø² Ù?Ù?Ø±Ø³Øª Ø¢Ø¯Ø±Ø³Ù?Ø§Û? Ø®Ù?Ø¯ Ø®Ø§Ø±Ø¬ Ù?Û? Ú©Ù?Û?Ù?.) \n"
 #~ "\n"
-#~ "Ù?Ø·Ù?Ø§ Ø¨Ù? Ø§Û?Ù? Ù?Ú©ØªÙ? ØªÙ?Ø¬Ù? Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯ Ú©Ù? Ø¯Ø± ØØ§Ù? ØØ§Ø¶Ø± Ø§Û?Ù?Û?Ù? Ù?Ø§Û? Ù?Ø¨ØªÙ?Û? Ø¨Ø± HTML Û?Ø§ "
-#~ "64 Ø¨Û?ØªÛ?Ø? Ù?Ø§Ø¨Ù? Ø¨Ø±Ø±Ø³Û? Ù?Ù?Û? Ø¨Ø§Ø´Ù?Ø¯. Ø¨Ù?Ø§Ø¨Ø±Ø§Û?Ù? Ø§Û?Ù?Û?Ù? Ù?Ø§Û? Ø®Ù?Ø¯ Ø±Ø§ Ø¨Ù? ØµÙ?Ø±Øª Ù?ØªÙ? Ø³Ø§Ø¯Ù? "
-#~ "Ø§Ø±Ø³Ø§Ù? Ù?Ù?Ø§Û?Û?Ø¯. \n"
+#~ "Ù?Ø·Ù?Ø§ Ø¨Ù? Ø§Û?Ù? Ù?Ú©ØªÙ? ØªÙ?Ø¬Ù? Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯ Ú©Ù? Ø¯Ø± ØØ§Ù? ØØ§Ø¶Ø± Ø§Û?Ù?Û?Ù? Ù?Ø§Û? Ù?Ø¨ØªÙ?Û? Ø¨Ø± HTML "
+#~ "Û?Ø§ 64 Ø¨Û?ØªÛ?Ø? Ù?Ø§Ø¨Ù? Ø¨Ø±Ø±Ø³Û? Ù?Ù?Û? Ø¨Ø§Ø´Ù?Ø¯. Ø¨Ù?Ø§Ø¨Ø±Ø§Û?Ù? Ø§Û?Ù?Û?Ù? Ù?Ø§Û? Ø®Ù?Ø¯ Ø±Ø§ Ø¨Ù? ØµÙ?Ø±Øª Ù?ØªÙ? "
+#~ "Ø³Ø§Ø¯Ù? Ø§Ø±Ø³Ø§Ù? Ù?Ù?Ø§Û?Û?Ø¯. \n"
 #~ "\n"
 #~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø³Ù?Ø§Ù?Û? Ø¯Ø§Ø±Û?Ø¯ Û?Ø§ Ø¨Ø±Ù?Ø§Ù?Ù? Ø¯Ú?Ø§Ø± Ø§Ø´Ú©Ø§Ù? Ø¨Ù?Ø¯Ù? Ù? Ú©Ø§Ø± Ù?Ù?Û? Ú©Ù?Ø¯ Ø? Ø¨Ø§ Ù?Ø³Ù?Øª "
 #~ "Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ø¨Ø§ Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± ØªÙ?Ø§Ø³ Ø¨Ú¯Û?Ø±Û?Ø¯ ØªØ§ Û?Ú© Ø§Ù?Ø³Ø§Ù? Ø¨Ù? Ø³Ù?Ø§Ù? Ø´Ù?Ø§ Ù¾Ø§Ø³Ø® Ø¯Ù?Ø¯:\n"
@@ -748,8 +659,8 @@ msgstr ""
 #~ "\n"
 #~ "Ø³Ù?Ø§Ù?! Ø±Ù?Ø¨Ø§Øª \"GetTor\" Ø¯Ø± Ø®Ø¯Ù?Øª Ø´Ù?Ø§Ø³Øª. \n"
 #~ " \n"
-#~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø¨Ù? Ù?Ù? Ø¨Ú¯Ù?Û?Û?Ø¯ Ú©Ù? Ø¨Ù? Ú©Ø¯Ø§Ù?Û?Ú© Ø§Ø² Ø¨Ø³ØªÙ? Ù?Ø§Û? Tor  Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯Ø? Ø¢Ù? Ø±Ø§ Ø¨Ø±Ø§Û? Ø´Ù?Ø§ "
-#~ "Ø§Ø±Ø³Ø§Ù? Ø®Ù?Ø§Ù?Ù? Ú©Ø±Ø¯. \n"
+#~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø¨Ù? Ù?Ù? Ø¨Ú¯Ù?Û?Û?Ø¯ Ú©Ù? Ø¨Ù? Ú©Ø¯Ø§Ù?Û?Ú© Ø§Ø² Ø¨Ø³ØªÙ? Ù?Ø§Û? Tor  Ù?Û?Ø§Ø² Ø¯Ø§Ø±Û?Ø¯Ø? Ø¢Ù? Ø±Ø§ Ø¨Ø±Ø§Û? "
+#~ "Ø´Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ø®Ù?Ø§Ù?Ù? Ú©Ø±Ø¯. \n"
 #~ "Ù?Ø·Ù?Ø§ Û?Ú©Û? Ø§Ø² Ø¨Ø³ØªÙ? Ù?Ø§Û? Ø±Ø§ Ø²Û?Ø± Ø¨Ø§ Ø°Ú©Ø± Ù?Ø§Ù? Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ù?Û?Ø¯:  \n"
 #~ " \n"
 #~ "tor-browser-bundle\n"
@@ -758,20 +669,20 @@ msgstr ""
 #~ "tor-im-browser-bundle\n"
 #~ "source-bundle\n"
 #~ "\n"
-#~ "Ù?Ø·Ù?Ø§ Ø¨Ù? Ø§Û?Ù? Ù?Ø§Ù?Ù? Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù? ( Ø¨Ù? Ø¢Ø¯Ø±Ø³ gettor@xxxxxxxxxxxxxx ) Ù? Ø¯Ø± Ù?Ø³Ù?ØªÛ? Ø§Ø² "
-#~ "Ù?ØªÙ? Ø§Û?Ù?Û?Ù? Ø®Ù?Ø¯ Ù?Ø§Ù? Û?Ú©Û? Ø§Ø² Ø¨Ø³ØªÙ? Ù?Ø§Û? Ù?Ù?Ù? Ø±Ø§ Ø°Ú©Ø± Ú©Ù?Û?Ø¯. \n"
+#~ "Ù?Ø·Ù?Ø§ Ø¨Ù? Ø§Û?Ù? Ù?Ø§Ù?Ù? Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù? ( Ø¨Ù? Ø¢Ø¯Ø±Ø³ gettor@xxxxxxxxxxxxxx ) Ù? Ø¯Ø± Ù?Ø³Ù?ØªÛ? "
+#~ "Ø§Ø² Ù?ØªÙ? Ø§Û?Ù?Û?Ù? Ø®Ù?Ø¯ Ù?Ø§Ù? Û?Ú©Û? Ø§Ø² Ø¨Ø³ØªÙ? Ù?Ø§Û? Ù?Ù?Ù? Ø±Ø§ Ø°Ú©Ø± Ú©Ù?Û?Ø¯. \n"
 #~ "\n"
 #~ "ØªÙ?Û?Ù? Ù?Ø³Ø®Ù? ØªØ±Ø¬Ù?Ù? Ø´Ø¯Ù?  TOR  \n"
 #~ "===================================\n"
 #~ "\n"
-#~ "Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ù?Ø³Ø®Ù? Ø§Û? Ø§Ø² TOR  ØªØ±Ø¬Ù?Ù? Ø´Ø¯Ù? Ø¨Ù? Ø²Ø¨Ø§Ù? Ù?ØÙ?Û? Ø´Ù?Ø§Ø? Ù?Û? Ø¨Ø§Û?Ø³ØªÛ? Ø²Ø¨Ø§Ù? Ù?Ù?Ø±Ø¯ "
-#~ "Ù?Ø¸Ø± Ø®Ù?Ø¯ Ø±Ø§ Ø¯Ø± Ø¢Ø¯Ø±Ø³ Ú¯Û?Ø±Ù?Ø¯Ù? Ø§Û?Ù?Û?Ù? Ø°Ú©Ø± Ú©Ù?Û?Ø¯. Ø¨Ø¹Ù?Ù?Ø§Ù? Ù?Ø«Ø§Ù?:  \n"
+#~ "Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ù?Ø³Ø®Ù? Ø§Û? Ø§Ø² TOR  ØªØ±Ø¬Ù?Ù? Ø´Ø¯Ù? Ø¨Ù? Ø²Ø¨Ø§Ù? Ù?ØÙ?Û? Ø´Ù?Ø§Ø? Ù?Û? Ø¨Ø§Û?Ø³ØªÛ? Ø²Ø¨Ø§Ù? "
+#~ "Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø± Ø®Ù?Ø¯ Ø±Ø§ Ø¯Ø± Ø¢Ø¯Ø±Ø³ Ú¯Û?Ø±Ù?Ø¯Ù? Ø§Û?Ù?Û?Ù? Ø°Ú©Ø± Ú©Ù?Û?Ø¯. Ø¨Ø¹Ù?Ù?Ø§Ù? Ù?Ø«Ø§Ù?:  \n"
 #~ "\n"
 #~ "gettor+zh@xxxxxxxxxxxxxx\n"
 #~ "\n"
-#~ "Ø¯Ø± Ø§Û?Ù? Ù?Ø«Ø§Ù?Ø? Ù?Ø±Ø³ØªÙ?Ø¯Ù? Ø®Ù?Ø§Ù?Ø§Ù? Ù?Ø³Ø®Ù? ØªØ±Ø¬Ù?Ù? Ø´Ø¯Ù? Ø¨Ù? Ø²Ø¨Ø§Ù? Ú?Û?Ù?Û? Ù?Û? Ø¨Ø§Ø´Ø¯. Ø¨Ø±Ø§Û? Ø¢Ú¯Ø§Ù?Û? "
-#~ "Ø§Ø² Ú©Ø¯Ù?Ø§Û? Ù?Ø±Ø¨Ù?Ø· Ø¨Ù? Ø²Ø¨Ø§Ù?Ù?Ø§Û? Ù?Ø§Ø¨Ù? Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? ØªÙ?Ø³Ø· Tor Ø? Ù?Ù?Ø±Ø³Øª Ø²Û?Ø± Ø±Ø§ Ù?Ø·Ø§Ù?Ø¹Ù? Ú©Ù?Û?Ø¯: "
-#~ "Ù?Ù?Ø±Ø³Øª Ø²Ø¨Ø§Ù?Ù?Ø§Û? Ù¾Ø´ØªÛ?Ø§Ù?Û? Ø´Ø¯Ù?\n"
+#~ "Ø¯Ø± Ø§Û?Ù? Ù?Ø«Ø§Ù?Ø? Ù?Ø±Ø³ØªÙ?Ø¯Ù? Ø®Ù?Ø§Ù?Ø§Ù? Ù?Ø³Ø®Ù? ØªØ±Ø¬Ù?Ù? Ø´Ø¯Ù? Ø¨Ù? Ø²Ø¨Ø§Ù? Ú?Û?Ù?Û? Ù?Û? Ø¨Ø§Ø´Ø¯. Ø¨Ø±Ø§Û? "
+#~ "Ø¢Ú¯Ø§Ù?Û? Ø§Ø² Ú©Ø¯Ù?Ø§Û? Ù?Ø±Ø¨Ù?Ø· Ø¨Ù? Ø²Ø¨Ø§Ù?Ù?Ø§Û? Ù?Ø§Ø¨Ù? Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? ØªÙ?Ø³Ø· Tor Ø? Ù?Ù?Ø±Ø³Øª Ø²Û?Ø± Ø±Ø§ "
+#~ "Ù?Ø·Ø§Ù?Ø¹Ù? Ú©Ù?Û?Ø¯: Ù?Ù?Ø±Ø³Øª Ø²Ø¨Ø§Ù?Ù?Ø§Û? Ù¾Ø´ØªÛ?Ø§Ù?Û? Ø´Ø¯Ù?\n"
 #~ "-------------------------\n"
 #~ "\n"
 #~ "gettor+ar@xxxxxxxxxxxxxx: Arabic\n"
@@ -826,8 +737,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -847,8 +758,8 @@ msgstr ""
 #~ "Ø¨Ø³ØªÙ? Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø±Û? Ù?Ø±Ø¨Ù?Ø·Ù? Ø±Ø§ Ø§Ø² ØØ§Ù?Øª Ù?Ø´Ø±Ø¯Ù? Ø®Ø§Ø±Ø¬ Ú©Ø±Ø¯Ù? (unzip) Ù? Ø§Ø¹ØªØ¨Ø§Ø± Ø¢Ù? Ø±Ø§ "
 #~ "Ø´Ù?Ø§Ø³Ø§Û?Û? (verify) Ú©Ù?Û?Ø¯.\n"
 #~ "\n"
-#~ "Ù?Ú©ØªÙ?: Ø§Ú¯Ø± GnuPG  Ø¯Ø± Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø´Ù?Ø§ Ù?ØµØ¨ Ø´Ø¯Ù? Ø§Ø³Øª Ø? Ù¾Ø³ Ø§Ø² Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? Ù?Ø§Û?Ù? zip Ø? Ø§Ø² "
-#~ "Ø§Ø¨Ø²Ø§Ø± Ø®Ø· Ù?Ø±Ù?Ø§Ù?  gpg  Ø¨Ù? ØªØ±ØªÛ?Ø¨ Ø²Û?Ø± Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯:  \n"
+#~ "Ù?Ú©ØªÙ?: Ø§Ú¯Ø± GnuPG  Ø¯Ø± Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø´Ù?Ø§ Ù?ØµØ¨ Ø´Ø¯Ù? Ø§Ø³Øª Ø? Ù¾Ø³ Ø§Ø² Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? Ù?Ø§Û?Ù? zip Ø? "
+#~ "Ø§Ø² Ø§Ø¨Ø²Ø§Ø± Ø®Ø· Ù?Ø±Ù?Ø§Ù?  gpg  Ø¨Ù? ØªØ±ØªÛ?Ø¨ Ø²Û?Ø± Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯:  \n"
 #~ "\n"
 #~ "gpg --verify <packagename>.asc <packagename>\n"
 #~ "\n"
@@ -861,15 +772,15 @@ msgstr ""
 #~ "\n"
 #~ "http://www.gnupg.org/related_software/frontends.html\n";
 #~ "\n"
-#~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø§Ø±ØªØ¨Ø§Ø· Ø§Û?Ù?ØªØ±Ù?ØªÛ? Ø´Ù?Ø§ Ù?Ø§Ù?Ø¹ Ø§Ø² Ø¯Ø³ØªØ±Ø³Û? ØªØ§Ù? Ø¨Ù? Ø´Ø¨Ú©Ù? Tor  Ù?Û? Ø´Ù?Ø¯Ø? Ù?Ù?Ú©Ù? Ø§Ø³Øª "
-#~ "Ø¨Ù? Ù¾Ù? ØªÙ?Ù?Û?ØªÛ? (Ø¨Ø§Ø²Ù¾Ø®Ø´) Ù?Û?Ø§Ø² Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯. Ù¾Ù? Ù?Ø§Û? ØªÙ?Ù?Û?ØªÛ? ( Ø¨Ø·Ù?Ø± Ù?Ø®ØªØµØ± \"Ù¾Ù? Ù?Ø§\") "
-#~ "Ø? ØªÙ?Ù?Û?Øª Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Tor Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¯Ø± Ù?Ù?Ø±Ø³Øª Ø§ØµÙ?Û? Ø? Ù?Û?Ø³Øª Ù?Ø´Ø¯Ù? Ø§Ù?Ø¯.  Ø¨Ù?Ø§Ø¨Ø±Ø§Û?Ù?Ø? Ø§Ø² "
-#~ "Ø¢Ù?Ø¬Ø§ Ú©Ù? Ù?Ù?Ø±Ø³Øª Ú©Ø§Ù?Ù? Ø¢Ù?Ù?Ø§ Ø¯Ø± Ø§Ø®ØªÛ?Ø§Ø± Ø¹Ù?Ù?Ù? Ù?Û?Ø³ØªØ? ØØªÛ? Ø§Ú¯Ø± Ø³Ø±Ù?Û?Ø³ Ø¯Ù?Ù?Ø¯Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø´Ù?Ø§ "
-#~ "Ø§Ù?Ø¯Ø§Ù? Ø¨Ù? Ù?Ø³Ø¯Ù?Ø¯ Ú©Ø±Ø¯Ù? ØªÙ?Ø§Ù?Û? ØªÙ?Ù?Û?Øª Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø´Ù?Ø§Ø®ØªÙ? Ø´Ø¯Ù? Tor  Ú©Ù?Ø¯Ø? Ø§ØØªÙ?Ø§Ù?Ø§ Ù?Ø§Ø¯Ø± "
-#~ "Ù?Ø®Ù?Ø§Ù?Ø¯ Ø¨Ù?Ø¯ ØªØ§ ØªÙ?Ø§Ù?Û? Ù¾Ù? Ù?Ø§Û? Tor  Ø±Ø§ Ù?Ø³Ø¯Ù?Ø¯ Ù?Ù?Ø§Û?Ø¯. \n"
+#~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø§Ø±ØªØ¨Ø§Ø· Ø§Û?Ù?ØªØ±Ù?ØªÛ? Ø´Ù?Ø§ Ù?Ø§Ù?Ø¹ Ø§Ø² Ø¯Ø³ØªØ±Ø³Û? ØªØ§Ù? Ø¨Ù? Ø´Ø¨Ú©Ù? Tor  Ù?Û? Ø´Ù?Ø¯Ø? Ù?Ù?Ú©Ù? "
+#~ "Ø§Ø³Øª Ø¨Ù? Ù¾Ù? ØªÙ?Ù?Û?ØªÛ? (Ø¨Ø§Ø²Ù¾Ø®Ø´) Ù?Û?Ø§Ø² Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯. Ù¾Ù? Ù?Ø§Û? ØªÙ?Ù?Û?ØªÛ? ( Ø¨Ø·Ù?Ø± Ù?Ø®ØªØµØ± "
+#~ "\"Ù¾Ù? Ù?Ø§\") Ø? ØªÙ?Ù?Û?Øª Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Tor Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¯Ø± Ù?Ù?Ø±Ø³Øª Ø§ØµÙ?Û? Ø? Ù?Û?Ø³Øª Ù?Ø´Ø¯Ù? Ø§Ù?Ø¯.  "
+#~ "Ø¨Ù?Ø§Ø¨Ø±Ø§Û?Ù?Ø? Ø§Ø² Ø¢Ù?Ø¬Ø§ Ú©Ù? Ù?Ù?Ø±Ø³Øª Ú©Ø§Ù?Ù? Ø¢Ù?Ù?Ø§ Ø¯Ø± Ø§Ø®ØªÛ?Ø§Ø± Ø¹Ù?Ù?Ù? Ù?Û?Ø³ØªØ? ØØªÛ? Ø§Ú¯Ø± Ø³Ø±Ù?Û?Ø³ "
+#~ "Ø¯Ù?Ù?Ø¯Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø´Ù?Ø§ Ø§Ù?Ø¯Ø§Ù? Ø¨Ù? Ù?Ø³Ø¯Ù?Ø¯ Ú©Ø±Ø¯Ù? ØªÙ?Ø§Ù?Û? ØªÙ?Ù?Û?Øª Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø´Ù?Ø§Ø®ØªÙ? Ø´Ø¯Ù? "
+#~ "Tor  Ú©Ù?Ø¯Ø? Ø§ØØªÙ?Ø§Ù?Ø§ Ù?Ø§Ø¯Ø± Ù?Ø®Ù?Ø§Ù?Ø¯ Ø¨Ù?Ø¯ ØªØ§ ØªÙ?Ø§Ù?Û? Ù¾Ù? Ù?Ø§Û? Tor  Ø±Ø§ Ù?Ø³Ø¯Ù?Ø¯ Ù?Ù?Ø§Û?Ø¯. \n"
 #~ "\n"
-#~ "Ø¨Ø±Ø§Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?Ø? Ø§Û?Ù?Û?Ù?Û? Ø±Ø§ Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯ Ú©Ù? Ø¯Ø± Ù?ØªÙ? Ø¢Ù?Ø?  Ú©Ù?Ù?Ø§Øª \"get "
-#~ "bridges\" Ø¯Ø±Ø¬ Ø´Ø¯Ù? Ø¨Ø§Ø´Ø¯: \n"
+#~ "Ø¨Ø±Ø§Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?Ø? Ø§Û?Ù?Û?Ù?Û? Ø±Ø§ Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯ Ú©Ù? Ø¯Ø± Ù?ØªÙ? Ø¢Ù?Ø?  Ú©Ù?Ù?Ø§Øª "
+#~ "\"get bridges\" Ø¯Ø±Ø¬ Ø´Ø¯Ù? Ø¨Ø§Ø´Ø¯: \n"
 #~ "bridges@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "Ù?Ù?Ú?Ù?Û?Ù? Ø¨Ø§ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø¨ Ù? Ø§Ø² Ø·Ø±Û?Ù? Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± Ù?Ù?Ú©Ù? Ø§Ø³ØªØ? Ù¾Ù? Ø¨Ø±Ø§Û? Tor  "
@@ -918,8 +829,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -945,11 +856,11 @@ msgstr ""
 #~ "Ø¨Ø±Ø§Û? Ø¨Ø§Ø²Ú©Ø±Ø¯Ù? Ø¢Ù?Ù?Ø§ Ø¨Ø± Ø±Ù?Û? Ø§Ù?Ù?Û?Ù? Ù?Ø§Û?Ù? Ø¯Ù?Ø¨Ø§Ø± Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯. \n"
 #~ "\n"
 #~ "Ø¨Ø³ØªÙ? Ù?Ø§ Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Ø± Ø§Ø³Ø§Ø³ Ù?Ù?Ø±Ø³Øª Ù¾Ø´Øª Ø³Ø± Ù?Ù? Ø¨Ø±Ø§Û?ØªØ§Ù? Ø§Ø±Ø³Ø§Ù? Ù?Ø´Ù?Ø¯! Ø¨Ù?Ø§Ø¨Ø±Ø§Û?Ù? "
-#~ "Ù?Ø·Ù?Ø§Ù¾Û?Ø´ Ø§Ø² Ø§Ù?Ø¯Ø§Ù? Ø¨Ù? Ø¨Ø§Ø²Ú©Ø±Ø¯Ù? Ù?Ø§Û?Ù?Ù?Ø§Û? Ù?Ø´Ø±Ø¯Ù?Ø? Ø§Ø·Ù?Û?Ù?Ø§Ù? ØØ§ØµÙ? Ú©Ù?Û?Ø¯ Ú©Ù? ØªÙ?Ø§Ù?Û? Ø¢Ù?Ù?Ø§ "
-#~ "Ø±Ø§ Ø¯Ø±Û?Ø§Ù?Øª Ú©Ø±Ø¯Ù? Ø§Û?Ø¯. \n"
+#~ "Ù?Ø·Ù?Ø§Ù¾Û?Ø´ Ø§Ø² Ø§Ù?Ø¯Ø§Ù? Ø¨Ù? Ø¨Ø§Ø²Ú©Ø±Ø¯Ù? Ù?Ø§Û?Ù?Ù?Ø§Û? Ù?Ø´Ø±Ø¯Ù?Ø? Ø§Ø·Ù?Û?Ù?Ø§Ù? ØØ§ØµÙ? Ú©Ù?Û?Ø¯ Ú©Ù? ØªÙ?Ø§Ù?Û? "
+#~ "Ø¢Ù?Ù?Ø§ Ø±Ø§ Ø¯Ø±Û?Ø§Ù?Øª Ú©Ø±Ø¯Ù? Ø§Û?Ø¯. \n"
 #~ "\n"
-#~ "Ù?Ú©ØªÙ?: Ø§Ú¯Ø± GnuPG  Ø¯Ø± Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø´Ù?Ø§ Ù?ØµØ¨ Ø´Ø¯Ù? Ø§Ø³Øª Ø? Ù¾Ø³ Ø§Ø² Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? Ù?Ø§Û?Ù? zip Ø? Ø§Ø² "
-#~ "Ø§Ø¨Ø²Ø§Ø± Ø®Ø· Ù?Ø±Ù?Ø§Ù?  gpg  Ø¨Ù? ØªØ±ØªÛ?Ø¨ Ø²Û?Ø± Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯:  \n"
+#~ "Ù?Ú©ØªÙ?: Ø§Ú¯Ø± GnuPG  Ø¯Ø± Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø´Ù?Ø§ Ù?ØµØ¨ Ø´Ø¯Ù? Ø§Ø³Øª Ø? Ù¾Ø³ Ø§Ø² Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? Ù?Ø§Û?Ù? zip Ø? "
+#~ "Ø§Ø² Ø§Ø¨Ø²Ø§Ø± Ø®Ø· Ù?Ø±Ù?Ø§Ù?  gpg  Ø¨Ù? ØªØ±ØªÛ?Ø¨ Ø²Û?Ø± Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯:  \n"
 #~ "\n"
 #~ "gpg --verify <packagename>.asc <packagename>\n"
 #~ "\n"
@@ -962,15 +873,15 @@ msgstr ""
 #~ "\n"
 #~ "http://www.gnupg.org/related_software/frontends.html\n";
 #~ "\n"
-#~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø§Ø±ØªØ¨Ø§Ø· Ø§Û?Ù?ØªØ±Ù?ØªÛ? Ø´Ù?Ø§ Ù?Ø§Ù?Ø¹ Ø§Ø² Ø¯Ø³ØªØ±Ø³Û? ØªØ§Ù? Ø¨Ù? Ø´Ø¨Ú©Ù? Tor  Ù?Û? Ø´Ù?Ø¯Ø? Ù?Ù?Ú©Ù? Ø§Ø³Øª "
-#~ "Ø¨Ù? Ù¾Ù? ØªÙ?Ù?Û?ØªÛ? (Ø¨Ø§Ø²Ù¾Ø®Ø´) Ù?Û?Ø§Ø² Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯. Ù¾Ù? Ù?Ø§Û? ØªÙ?Ù?Û?ØªÛ? ( Ø¨Ø·Ù?Ø± Ù?Ø®ØªØµØ± \"Ù¾Ù? Ù?Ø§\") "
-#~ "Ø? ØªÙ?Ù?Û?Øª Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Tor Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¯Ø± Ù?Ù?Ø±Ø³Øª Ø§ØµÙ?Û? Ø? Ù?Û?Ø³Øª Ù?Ø´Ø¯Ù? Ø§Ù?Ø¯.  Ø¨Ù?Ø§Ø¨Ø±Ø§Û?Ù?Ø? Ø§Ø² "
-#~ "Ø¢Ù?Ø¬Ø§ Ú©Ù? Ù?Ù?Ø±Ø³Øª Ú©Ø§Ù?Ù? Ø¢Ù?Ù?Ø§ Ø¯Ø± Ø§Ø®ØªÛ?Ø§Ø± Ø¹Ù?Ù?Ù? Ù?Û?Ø³ØªØ? ØØªÛ? Ø§Ú¯Ø± Ø³Ø±Ù?Û?Ø³ Ø¯Ù?Ù?Ø¯Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø´Ù?Ø§ "
-#~ "Ø§Ù?Ø¯Ø§Ù? Ø¨Ù? Ù?Ø³Ø¯Ù?Ø¯ Ú©Ø±Ø¯Ù? ØªÙ?Ø§Ù?Û? ØªÙ?Ù?Û?Øª Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø´Ù?Ø§Ø®ØªÙ? Ø´Ø¯Ù? Tor  Ú©Ù?Ø¯Ø? Ø§ØØªÙ?Ø§Ù?Ø§ Ù?Ø§Ø¯Ø± "
-#~ "Ù?Ø®Ù?Ø§Ù?Ø¯ Ø¨Ù?Ø¯ ØªØ§ ØªÙ?Ø§Ù?Û? Ù¾Ù? Ù?Ø§Û? Tor  Ø±Ø§ Ù?Ø³Ø¯Ù?Ø¯ Ù?Ù?Ø§Û?Ø¯. \n"
+#~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø§Ø±ØªØ¨Ø§Ø· Ø§Û?Ù?ØªØ±Ù?ØªÛ? Ø´Ù?Ø§ Ù?Ø§Ù?Ø¹ Ø§Ø² Ø¯Ø³ØªØ±Ø³Û? ØªØ§Ù? Ø¨Ù? Ø´Ø¨Ú©Ù? Tor  Ù?Û? Ø´Ù?Ø¯Ø? Ù?Ù?Ú©Ù? "
+#~ "Ø§Ø³Øª Ø¨Ù? Ù¾Ù? ØªÙ?Ù?Û?ØªÛ? (Ø¨Ø§Ø²Ù¾Ø®Ø´) Ù?Û?Ø§Ø² Ø¯Ø§Ø´ØªÙ? Ø¨Ø§Ø´Û?Ø¯. Ù¾Ù? Ù?Ø§Û? ØªÙ?Ù?Û?ØªÛ? ( Ø¨Ø·Ù?Ø± Ù?Ø®ØªØµØ± "
+#~ "\"Ù¾Ù? Ù?Ø§\") Ø? ØªÙ?Ù?Û?Øª Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Tor Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¯Ø± Ù?Ù?Ø±Ø³Øª Ø§ØµÙ?Û? Ø? Ù?Û?Ø³Øª Ù?Ø´Ø¯Ù? Ø§Ù?Ø¯.  "
+#~ "Ø¨Ù?Ø§Ø¨Ø±Ø§Û?Ù?Ø? Ø§Ø² Ø¢Ù?Ø¬Ø§ Ú©Ù? Ù?Ù?Ø±Ø³Øª Ú©Ø§Ù?Ù? Ø¢Ù?Ù?Ø§ Ø¯Ø± Ø§Ø®ØªÛ?Ø§Ø± Ø¹Ù?Ù?Ù? Ù?Û?Ø³ØªØ? ØØªÛ? Ø§Ú¯Ø± Ø³Ø±Ù?Û?Ø³ "
+#~ "Ø¯Ù?Ù?Ø¯Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø´Ù?Ø§ Ø§Ù?Ø¯Ø§Ù? Ø¨Ù? Ù?Ø³Ø¯Ù?Ø¯ Ú©Ø±Ø¯Ù? ØªÙ?Ø§Ù?Û? ØªÙ?Ù?Û?Øª Ú©Ù?Ù?Ø¯Ù? Ù?Ø§Û? Ø´Ù?Ø§Ø®ØªÙ? Ø´Ø¯Ù? "
+#~ "Tor  Ú©Ù?Ø¯Ø? Ø§ØØªÙ?Ø§Ù?Ø§ Ù?Ø§Ø¯Ø± Ù?Ø®Ù?Ø§Ù?Ø¯ Ø¨Ù?Ø¯ ØªØ§ ØªÙ?Ø§Ù?Û? Ù¾Ù? Ù?Ø§Û? Tor  Ø±Ø§ Ù?Ø³Ø¯Ù?Ø¯ Ù?Ù?Ø§Û?Ø¯. \n"
 #~ "\n"
-#~ "Ø¨Ø±Ø§Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?Ø? Ø§Û?Ù?Û?Ù?Û? Ø±Ø§ Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯ Ú©Ù? Ø¯Ø± Ù?ØªÙ? Ø¢Ù?Ø?  Ú©Ù?Ù?Ø§Øª \"get "
-#~ "bridges\" Ø¯Ø±Ø¬ Ø´Ø¯Ù? Ø¨Ø§Ø´Ø¯: \n"
+#~ "Ø¨Ø±Ø§Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ù¾Ù?Ø? Ø§Û?Ù?Û?Ù?Û? Ø±Ø§ Ø¨Ù? Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯ Ú©Ù? Ø¯Ø± Ù?ØªÙ? Ø¢Ù?Ø?  Ú©Ù?Ù?Ø§Øª "
+#~ "\"get bridges\" Ø¯Ø±Ø¬ Ø´Ø¯Ù? Ø¨Ø§Ø´Ø¯: \n"
 #~ "bridges@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "Ù?Ù?Ú?Ù?Û?Ù? Ø¨Ø§ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø¨ Ù? Ø§Ø² Ø·Ø±Û?Ù? Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± Ù?Ù?Ú©Ù? Ø§Ø³ØªØ? Ù¾Ù? Ø¨Ø±Ø§Û? Tor  "
@@ -986,8 +897,8 @@ msgstr ""
 #~ "\n"
 #~ "    Hello, This is the \"GetTor\" robot.\n"
 #~ "\n"
-#~ "    Thank you for your request. It was successfully understood. Your request "
-#~ "is\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"
@@ -1006,15 +917,15 @@ msgstr ""
 #~ "\n"
 #~ "Ø³Ù?Ø§Ù?! Ø±Ù?Ø¨Ø§Øª \"GetTor\" Ø¯Ø± Ø®Ø¯Ù?Øª Ø´Ù?Ø§Ø³Øª. \n"
 #~ "\n"
-#~ "Ø¨Ø§ ØªØ´Ú©Ø± Ø§Ø² Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§. Ù?Ù?Ø±Ø¯ Ø¯Ø±Ø®Ù?Ø§Ø³ØªÛ? Ø´Ù?Ø§ Ø¯Ø± Ø¯Ø³Øª Ø§Ù?Ø¯Ø§Ù? Ø§Ø³Øª.  Ø¨Ø³ØªÙ? Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø±Û? "
-#~ "Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø± Ø´Ù?Ø§ Ù?Û? Ø¨Ø§Û?Ø³ØªÛ? Ø·Û? Ø¯Ù? Ø¯Ù?Û?Ù?Ù? Ø¢Û?Ù?Ø¯Ù? Ø¨Ù? Ø¯Ø³Øª Ø´Ù?Ø§ Ø¨Ø±Ø³Ø¯. \n"
+#~ "Ø¨Ø§ ØªØ´Ú©Ø± Ø§Ø² Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø´Ù?Ø§. Ù?Ù?Ø±Ø¯ Ø¯Ø±Ø®Ù?Ø§Ø³ØªÛ? Ø´Ù?Ø§ Ø¯Ø± Ø¯Ø³Øª Ø§Ù?Ø¯Ø§Ù? Ø§Ø³Øª.  Ø¨Ø³ØªÙ? Ù?Ø±Ù? "
+#~ "Ø§Ù?Ø²Ø§Ø±Û? Ù?Ù?Ø±Ø¯ Ù?Ø¸Ø± Ø´Ù?Ø§ Ù?Û? Ø¨Ø§Û?Ø³ØªÛ? Ø·Û? Ø¯Ù? Ø¯Ù?Û?Ù?Ù? Ø¢Û?Ù?Ø¯Ù? Ø¨Ù? Ø¯Ø³Øª Ø´Ù?Ø§ Ø¨Ø±Ø³Ø¯. \n"
 #~ "\n"
 #~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø¨Ø³ØªÙ? Ø±Ø§ Ø¯Ø±Û?Ø§Ù?Øª Ù?Ú©Ø±Ø¯Û?Ø¯Ø? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¹Ù?Øª Ø¢Ù? ØØ¬Ù? Ø¨Ø²Ø±Ú¯ Ù?Ø§Û?Ù? Ù?Ø³Ø¨Øª Ø¨Ù? Ø¸Ø±Ù?Û?Øª "
 #~ "Ø§Û?Ù?Û?Ù? Ø´Ù?Ø§ Ø¨Ø§Ø´Ø¯. \n"
-#~ "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø®Ù?Ø¯ Ø±Ø§ Ù?Ø¬Ø¯Ø¯Ø§ Ù? Ø§Û?Ù?Ø¨Ø§Ø± Ø§Ø² ØØ³Ø§Ø¨ Ù?Ø§Û? Ø§Û?Ù?Û?Ù? gmail.com  Û?Ø§yahoo.cn  Ø¨Ø±Ø§Û? "
-#~ "Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯. \n"
-#~ "Ù?Ù?Ú?Ù?Û?Ù? Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ Ø¨Ù? Ø¬Ø§Û? tor-browser-bundle  Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø± tor-im-browser-bundle "
-#~ " Ø±Ø§ Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ú©Ù?Û?Ø¯ Ú©Ù? ØØ¬Ù? Ú©Ù?ØªØ±Û? Ø¯Ø§Ø±Ø¯. \n"
+#~ "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ø®Ù?Ø¯ Ø±Ø§ Ù?Ø¬Ø¯Ø¯Ø§ Ù? Ø§Û?Ù?Ø¨Ø§Ø± Ø§Ø² ØØ³Ø§Ø¨ Ù?Ø§Û? Ø§Û?Ù?Û?Ù? gmail.com  Û?Ø§yahoo.cn  "
+#~ "Ø¨Ø±Ø§Û? Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯. \n"
+#~ "Ù?Ù?Ú?Ù?Û?Ù? Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ Ø¨Ù? Ø¬Ø§Û? tor-browser-bundle  Ù?Ø±Ù? Ø§Ù?Ø²Ø§Ø± tor-im-browser-"
+#~ "bundle  Ø±Ø§ Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ú©Ù?Û?Ø¯ Ú©Ù? ØØ¬Ù? Ú©Ù?ØªØ±Û? Ø¯Ø§Ø±Ø¯. \n"
 #~ "\n"
 #~ "Ú?Ù?Ø§Ù?Ú?Ù? Ø³Ù?Ø§Ù?Û? Ø¯Ø§Ø±Û?Ø¯ Û?Ø§ Ø¨Ø±Ù?Ø§Ù?Ù? Ø¯Ú?Ø§Ø± Ø§Ø´Ú©Ø§Ù? Ø¨Ù?Ø¯Ù? Ù? Ú©Ø§Ø± Ù?Ù?Û? Ú©Ù?Ø¯ Ø? Ø¨Ø§ Ù?Ø³Ù?Øª "
 #~ "Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ø¨Ø§ Ø¢Ø¯Ø±Ø³ Ø²Û?Ø± ØªÙ?Ø§Ø³ Ø¨Ú¯Û?Ø±Û?Ø¯ ØªØ§ Û?Ú© Ø§Ù?Ø³Ø§Ù? Ø¨Ù? Ø³Ù?Ø§Ù? Ø´Ù?Ø§ Ù¾Ø§Ø³Ø® Ø¯Ù?Ø¯:\n"
diff --git a/i18n/fi/gettor.po b/i18n/fi/gettor.po
index ccdee7f..44a2517 100644
--- a/i18n/fi/gettor.po
+++ b/i18n/fi/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-04-08 07:46-0600\n"
 "Last-Translator: AmaliaH <hilkka39@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "    Moi, TÃ¤mÃ¤ on \"GetTor\" automaattivastaaja.\n"
@@ -31,180 +30,155 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
-"	Valitettavasti emme voi vastata sinulle tÃ¤hÃ¤n\n"
-"	sÃ¤hkÃ¶postiosoitteeseen. Sinun tulee luoda joko\n"
-"	gmail- tai Yahoo tili josta lÃ¤hetÃ¤t sÃ¤hkÃ¶postin.\n"
+"\tValitettavasti emme voi vastata sinulle tÃ¤hÃ¤n\n"
+"\tsÃ¤hkÃ¶postiosoitteeseen. Sinun tulee luoda joko\n"
+"\tgmail- tai Yahoo tili josta lÃ¤hetÃ¤t sÃ¤hkÃ¶postin.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
-"	KÃ¤sittelemme ainoastaan \"DKIM\" ominaisuutta tukevista\n"
-"	sÃ¤hkÃ¶posteista tulevat kyselyt. DKIM (Domain Key Identified\n"
-"	Mail) on email tunnistusmenetelmÃ¤.\n"
+"\tKÃ¤sittelemme ainoastaan \"DKIM\" ominaisuutta tukevista\n"
+"\tsÃ¤hkÃ¶posteista tulevat kyselyt. DKIM (Domain Key Identified\n"
+"\tMail) on email tunnistusmenetelmÃ¤.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
-"	(Pahoittelemme mikÃ¤li tÃ¤mÃ¤ sÃ¤hkÃ¶postiviesti on turha. Koska\n"
-"	sinun sÃ¤hkÃ¶postisi on tullut palvelusta joka ei kÃ¤ytÃ¤ DKIM\n"
-"	menetelmÃ¤Ã¤, lÃ¤hetimme tÃ¤mÃ¤n selityksen. TÃ¤tÃ¤\n"
-"	sÃ¤hkÃ¶postiosoitetta\n"
-"	ei oteta enÃ¤Ã¤n huomioon tulevaisuudessa.)\n"
+"\t(Pahoittelemme mikÃ¤li tÃ¤mÃ¤ sÃ¤hkÃ¶postiviesti on turha. Koska\n"
+"\tsinun sÃ¤hkÃ¶postisi on tullut palvelusta joka ei kÃ¤ytÃ¤ DKIM\n"
+"\tmenetelmÃ¤Ã¤, lÃ¤hetimme tÃ¤mÃ¤n selityksen. TÃ¤tÃ¤\n"
+"\tsÃ¤hkÃ¶postiosoitetta\n"
+"\tei oteta enÃ¤Ã¤n huomioon tulevaisuudessa.)\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
-"	Ota huomioon ettÃ¤ tÃ¤llÃ¤hetkellÃ¤ emme voi kÃ¤sitellÃ¤ HTML tai\n"
-"	base64 sÃ¤hkÃ¶posteja. KÃ¤ytÃ¤ muotoilematonta tekstiÃ¤. (plain\n"
-"	text).\n"
+"\tOta huomioon ettÃ¤ tÃ¤llÃ¤hetkellÃ¤ emme voi kÃ¤sitellÃ¤ HTML tai\n"
+"\tbase64 sÃ¤hkÃ¶posteja. KÃ¤ytÃ¤ muotoilematonta tekstiÃ¤. (plain\n"
+"\ttext).\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
-"	MikÃ¤li sinulla on kysymyksiÃ¤ joihin tarvitset\n"
-"	henkilÃ¶kohtaisen vastauksen, voit lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia\n"
-"	osoitteella tor-assistants@xxxxxxxxxxxxxx\n"
+"\tMikÃ¤li sinulla on kysymyksiÃ¤ joihin tarvitset\n"
+"\thenkilÃ¶kohtaisen vastauksen, voit lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia\n"
+"\tosoitteella tor-assistants@xxxxxxxxxxxxxx\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
-"	LÃ¤hetÃ¤n sinulle Tor paketin kunhan kerrot minkÃ¤ haluat. Ole\n"
-"	hyvÃ¤ ja valitse jokin seuraavista nimikkeistÃ¤:\n"
+"\tLÃ¤hetÃ¤n sinulle Tor paketin kunhan kerrot minkÃ¤ haluat. Ole\n"
+"\thyvÃ¤ ja valitse jokin seuraavista nimikkeistÃ¤:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
-"	Vastaa (reply) tÃ¤hÃ¤n sÃ¤hkÃ¶postiin (to gettor@xxxxxxxxxxxxxx)\n"
-"	ja sisÃ¤llytÃ¤ haluamasi paketin nimi sÃ¤hkÃ¶postin\n"
-"	tekstiosuuteen.\n"
+"\tVastaa (reply) tÃ¤hÃ¤n sÃ¤hkÃ¶postiin (to gettor@xxxxxxxxxxxxxx)\n"
+"\tja sisÃ¤llytÃ¤ haluamasi paketin nimi sÃ¤hkÃ¶postin\n"
+"\ttekstiosuuteen.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
-"	PAIKALLINEN TOR VERSIO\n"
+"\tPAIKALLINEN TOR VERSIO\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
-"	Saadaksesi haluamasi kieliversion TOR ohjelmasta, kerro\n"
-"	haluamasi kieliversio sÃ¤hkÃ¶postissasi.\n"
+"\tSaadaksesi haluamasi kieliversion TOR ohjelmasta, kerro\n"
+"\thaluamasi kieliversio sÃ¤hkÃ¶postissasi.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
-"	Seuraavassa esimerkki kuinka saat haluamasi paketin\n"
-"	KiinankielisenÃ¤. Alempana lista tuetuista kielikoodeista\n"
+"\tSeuraavassa esimerkki kuinka saat haluamasi paketin\n"
+"\tKiinankielisenÃ¤. Alempana lista tuetuista kielikoodeista\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
-"	Tuettujen kieliversioiden lista\n"
+"\tTuettujen kieliversioiden lista\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
-"	Lista kaikista saatavilla olevista kieliversioista.\n"
+"\tLista kaikista saatavilla olevista kieliversioista.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -215,9 +189,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabia\n"
@@ -234,215 +206,161 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "    Jos et tee kielivalintaa, sinulle lÃ¤hetetÃ¤Ã¤n Englanninkielinen versio.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "    OSIIN JAETUT PAKETIT (SPLITATUT)\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
-"	Jos sinulla on hidas yhteys tai et voi vastaanottaa suuria\n"
-"	liitetiedostoja, voit kÃ¤yttÃ¤Ã¤ ominaisuutta jolla GetTor\n"
-"	lÃ¤hetetÃ¤Ã¤n sinulle useissa pienissÃ¤ osissa yhden suuren\n"
-"	sijaan.\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
+"\tJos sinulla on hidas yhteys tai et voi vastaanottaa suuria\n"
+"\tliitetiedostoja, voit kÃ¤yttÃ¤Ã¤ ominaisuutta jolla GetTor\n"
+"\tlÃ¤hetetÃ¤Ã¤n sinulle useissa pienissÃ¤ osissa yhden suuren\n"
+"\tsijaan.\n"
 "\n"
-"	SisÃ¤llytÃ¤ sana 'split' sÃ¤hkÃ¶postiviestisi johonkin kohtaan:\n"
 "    "
 
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
-"	Split- sana sÃ¤hkÃ¶postisi tekstissÃ¤ aiheuttaa sen ettÃ¤ Tor\n"
-"	Browser Bundle lÃ¤hetetÃ¤Ã¤n sinulle 1.4MB kokoisissa osissa.\n"
-"\n"
+"\tSisÃ¤llytÃ¤ sana 'split' sÃ¤hkÃ¶postiviestisi johonkin kohtaan:\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
-"	Kun olet vastaanottanut kaikki osatiedostot, sinun tulee\n"
-"	yhdistÃ¤Ã¤ ne jÃ¤lleen yhdeksi tiedostoksi.Ohje:\n"
+"\tSplit- sana sÃ¤hkÃ¶postisi tekstissÃ¤ aiheuttaa sen ettÃ¤ Tor\n"
+"\tBrowser Bundle lÃ¤hetetÃ¤Ã¤n sinulle 1.4MB kokoisissa osissa.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
-"	1.)Talleta kaikki osatiedostot yhteen kansioon haluamaasi\n"
-"	paikkaan kovalevyllÃ¤si.\n"
+"\tKun olet vastaanottanut kaikki osatiedostot, sinun tulee\n"
+"\tyhdistÃ¤Ã¤ ne jÃ¤lleen yhdeksi tiedostoksi.Ohje:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
-msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
-"	2.) Pura (unzip) kaikki osatiedostot joiden nimi pÃ¤Ã¤ttyy\n"
-"	\".z\".\n"
+"\t1.)Talleta kaikki osatiedostot yhteen kansioon haluamaasi\n"
+"\tpaikkaan kovalevyllÃ¤si.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"	3.)NimeÃ¤ seuraavien tiedostojen tiedostopÃ¤Ã¤tteet\n"
-"	uudestaan:\".ex_RENAME\" => \".exe\" \".ex_RENAME.ASC\"\n"
-"	=>\".exe.asc\"\n"
+"\t2.) Pura (unzip) kaikki osatiedostot joiden nimi pÃ¤Ã¤ttyy\n"
+"\t\".z\".\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
-"	4.) Tarkista kaikki tiedostot kuten niiden mukana olleessa\n"
-"	sÃ¤hkÃ¶postissa on kerrottu.\n"
+"\t4.) Tarkista kaikki tiedostot kuten niiden mukana olleessa\n"
+"\tsÃ¤hkÃ¶postissa on kerrottu.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
-"	5.) KÃ¤ytÃ¤ Windowsin pakkauksenpurkuohjelmaa (WinRAR) tai\n"
-"	jotain muuta sopivaa ohjelmaa pakettien purkamiseen. Jos\n"
-"	sinulla ei ole sopivaa ohjelmaa niin voit saada sen tÃ¤Ã¤ltÃ¤:\n"
+"\t5.) KÃ¤ytÃ¤ Windowsin pakkauksenpurkuohjelmaa (WinRAR) tai\n"
+"\tjotain muuta sopivaa ohjelmaa pakettien purkamiseen. Jos\n"
+"\tsinulla ei ole sopivaa ohjelmaa niin voit saada sen tÃ¤Ã¤ltÃ¤:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
-"	Purkaaksesi Tor paketin, tuplaklikkaa \".exe\" tiedostoa.\n"
+"\tPurkaaksesi Tor paketin, tuplaklikkaa \".exe\" tiedostoa.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
-"	6.) Kun purkaminen on valmis, kansiossa mihin purit kaikki\n"
-"	pitÃ¤isi nyt lÃ¶ytyÃ¤ uusi \".exe\" tiedosto.\n"
-"	Kaksoisklikkaamalla tÃ¤tÃ¤ tiedostoa, Tor Browser Bundle\n"
-"	kÃ¤ynnistyy.\n"
+"\t6.) Kun purkaminen on valmis, kansiossa mihin purit kaikki\n"
+"\tpitÃ¤isi nyt lÃ¶ytyÃ¤ uusi \".exe\" tiedosto.\n"
+"\tKaksoisklikkaamalla tÃ¤tÃ¤ tiedostoa, Tor Browser Bundle\n"
+"\tkÃ¤ynnistyy.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
-"	Se on siinÃ¤!Kaikkea kivaa ja kiitos Torrin kÃ¤yttÃ¤misestÃ¤!\n"
+"\tSe on siinÃ¤!Kaikkea kivaa ja kiitos Torrin kÃ¤yttÃ¤misestÃ¤!\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"	TUKI\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "    TÃ¤ssÃ¤ pyytÃ¤mÃ¤si ohjelma pakattuna zip tiedostona. Pura \n"
@@ -450,52 +368,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
-"	Vihje: Jos PC:ssÃ¤si on GnuPG asennettuna, kÃ¤ytÃ¤ gpg\n"
-"	komentorivityÃ¶kalua tiedoston ohjeen mukaan purkamisen\n"
-"	jÃ¤lkeen:\n"
+"\tVihje: Jos PC:ssÃ¤si on GnuPG asennettuna, kÃ¤ytÃ¤ gpg\n"
+"\tkomentorivityÃ¶kalua tiedoston ohjeen mukaan purkamisen\n"
+"\tjÃ¤lkeen:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "    Tulos nÃ¤yttÃ¤Ã¤ jotakuinkin tÃ¤llaiselta:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "    Jos komentorivi (dos) tyÃ¶skentely ei ole sinulle tuttua, kokeile \n"
@@ -503,17 +402,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    Jos internetyhteyden tarjoajasi estÃ¤Ã¤ pÃ¤Ã¤syn Tor verkkoon\n"
@@ -524,15 +421,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "    Voit pyytÃ¤Ã¤ siltaa lÃ¤hettÃ¤mÃ¤llÃ¤ emailia joka sisÃ¤ltÃ¤Ã¤ \"get bridges\"\n"
@@ -541,14 +434,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "    Voit myÃ¶s pyytÃ¤Ã¤ listan vÃ¤littimistÃ¤ selaimellasi seuraavasta "
@@ -557,16 +447,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    TÃ?RKEÃ?Ã? HUOMIOIDA:\n"
@@ -577,13 +465,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "    Osatiedostot saattavat saapua epÃ¤jÃ¤rjestyksessÃ¤! Varmista ettÃ¤ "
@@ -592,16 +478,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Kiitos pyynnÃ¶stÃ¤si. Se ymmÃ¤rrettiin ja on nyt \n"
@@ -609,16 +491,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "    Jos et saa pakettia, se on ehkÃ¤ liian suuri sÃ¤hkÃ¶postiohjelmallesi.\n"
@@ -628,15 +505,11 @@ msgstr ""
 "browser-bundle.\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "    Valitettavsti teknisten ongelmien vuoksi emme voi vastata \n"
@@ -644,13 +517,46 @@ msgstr ""
 "kiitos....\n"
 "  "
 
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\t3.)NimeÃ¤ seuraavien tiedostojen tiedostopÃ¤Ã¤tteet\n"
+#~ "\tuudestaan:\".ex_RENAME\" => \".exe\" \".ex_RENAME.ASC\"\n"
+#~ "\t=>\".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\tTUKI\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid "Won't send myself emails."
 #~ msgstr "En lÃ¤hetÃ¤ itselleni sÃ¤hkÃ¶postia."
 
-#, python-format
 #~ msgid "Signature is: %s"
 #~ msgstr "Allekirjoitus on: %s"
 
-#, python-format
 #~ msgid "Package: %s selected."
 #~ msgstr "Paketti: %s valittu."
diff --git a/i18n/fil/gettor.po b/i18n/fil/gettor.po
index e7e6736..a711308 100644
--- a/i18n/fil/gettor.po
+++ b/i18n/fil/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/fo/gettor.po b/i18n/fo/gettor.po
index e7e6736..a711308 100644
--- a/i18n/fo/gettor.po
+++ b/i18n/fo/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/fr/gettor.po b/i18n/fr/gettor.po
index abf2eda..d7a2bd7 100644
--- a/i18n/fr/gettor.po
+++ b/i18n/fr/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-06-02 12:35-0600\n"
 "Last-Translator: Pierre Antoine <pierre.antoine@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "    Bonjour, je suis le robot \"GetTor\".\n"
@@ -31,14 +30,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "    Malheureusement, nous ne rÃ©pondrons pas Ã  cette adresse. Vous devriez "
@@ -48,14 +45,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "    Nous rÃ©pondons uniquement aux requÃªtes qui viennent de services de "
@@ -65,14 +60,12 @@ msgstr ""
 "envoyÃ©.\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "     (Nous nous excusons si vous n'avez pas demandÃ© ce courriel. Puisque "
@@ -84,13 +77,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "    Veuillez noter qu'actuellement, nous ne pouvons traiter des courriels au "
@@ -99,27 +90,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
-"    Si vous avez des questions ou si Ã§a ne marche pas, vous pouvez contacter\n"
-"    un humain Ã  cette adresse de support :     tor-assistants@xxxxxxxxxxxxxx\n"
+"    Si vous avez des questions ou si Ã§a ne marche pas, vous pouvez "
+"contacter\n"
+"    un humain Ã  cette adresse de support :     tor-assistants@torproject."
+"org\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "     Je vais vous envoyer un paquet Tor, si vous me dites lequel vous "
@@ -128,13 +117,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    Veuillez rÃ©pondre Ã  ce courriel (Ã  gettor@xxxxxxxxxxxxxx), et me dire\n"
@@ -143,23 +130,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "    OBTENIR DES VERSIONS DE TOR DANS VOTRE LANGUE\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "    Afin d'obtenir une version de Tor dans votre langue, veuillez spÃ©cifer "
@@ -169,46 +152,40 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "    Cet exemple vous donnera le paquet demandÃ© dans une version traduite\n"
-"    en chinois. Voir ci-dessous pour une liste de codes de langue supportÃ©s.\n"
+"    en chinois. Voir ci-dessous pour une liste de codes de langue "
+"supportÃ©s.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "    Liste de langues supportÃ©es :\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "    Voici une liste de toutes les langues disponibles : \n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -219,9 +196,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabe\n"
@@ -238,12 +213,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "    Si vous ne sÃ©lectionnez pas de langue, vous alle recevoir la version "
@@ -251,25 +223,21 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "    PAQUETS DE PETITE TAILLE\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "    Si votre bande passante est limitÃ©e ou si votre fournisseur de courriel "
@@ -282,24 +250,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "    Il suffit d'inclure le mot clef 'split' quelque part dans votre "
 "courriel, comme ceci :\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "    Si vous envoyez ce texte dans un courriel adressÃ© Ã  GetTor, vous allez\n"
@@ -308,13 +272,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "    AprÃ¨s avoir reÃ§u tous les parts, il vous faudra les rÃ©assembler\n"
@@ -322,12 +284,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "    1.) Sauvegardez toutes les piÃ¨ces jointes reÃ§ues dans un rÃ©pertoire sur "
@@ -335,13 +294,11 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
 "    2.) DÃ©zippez tous les fichiers finissant en \".z\". Si vous avze "
@@ -351,31 +308,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"    3.) Renommez l'extension du fichier qui se finit par \".ex_RENAME\" en "
-"\".exe\"\n"
-"        et renommez aussi celui qui se finit en \".ex_RENAME.asc\" pour finir "
-"en\n"
-"        \".exe.asc\".\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "    4. VÃ©rifiez tous les fchiers comme dÃ©crit dans les courriels reÃ§us avec\n"
@@ -383,14 +320,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "    5.) Maintenant utilisez un logiciel qui sait dÃ©compresser des fichiers "
@@ -401,12 +336,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "        Pour dÃ©compresser le paquet Tor, il suffit de double cliquer sur le "
@@ -414,14 +346,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "    6.) AprÃ¨s avoir dÃ©compressÃ© les fichiers, vous devriez trouver un\n"
@@ -432,35 +362,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
-"    7.) Ã?a y est. Vous avez fini. Merci d'utiliser Tor et amusez-vous bien !\n"
+"    7.) Ã?a y est. Vous avez fini. Merci d'utiliser Tor et amusez-vous "
+"bien !\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"    AIDE\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "    Voici le logiciel que vous avez demandÃ© en tant que zip. \n"
@@ -468,13 +388,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "    Conseil : Si vous avez installÃ© GnuPG sur votre ordinateur, utilisez\n"
@@ -483,37 +401,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "    Le rÃ©sultat devrait ressembler Ã  peu prÃ¨s Ã  cela :\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "    Si vous n'Ãªtes pas familier avec les outils en ligne de commande,\n"
@@ -521,17 +422,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    Si votre fournisseur d'accÃ¨s Ã  Internet bloque l'accÃ¨s au rÃ©seau Tor,\n"
@@ -545,15 +444,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "    Vous pouvez connaÃ®tre un serveur passerelle en envoyant un courriel qui "
@@ -563,14 +458,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "    Il est aussi possible de rÃ©cupÃ©rer des serveurs passerelle en visitant "
@@ -579,16 +471,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    NOTE IMPORTANTE :\n"
@@ -601,13 +491,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "    Les paquets peuvent arriver en dÃ©sordre ! Assurez-vous d'avoir\n"
@@ -615,16 +503,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Merci de votre demande. Elle a Ã©tÃ© comprise. Votre demande est en cours\n"
@@ -632,16 +516,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "    S'il n'arrive pas, il se pourrait que le paquet est trop lours pour "
@@ -653,15 +532,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "    Malheureusement nous avons actuellement des problÃ¨mes et ne pouvons\n"
@@ -672,6 +547,43 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    3.) Renommez l'extension du fichier qui se finit par \".ex_RENAME\" "
+#~ "en \".exe\"\n"
+#~ "        et renommez aussi celui qui se finit en \".ex_RENAME.asc\" pour "
+#~ "finir en\n"
+#~ "        \".exe.asc\".\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    AIDE\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
 #~ "\n"
 #~ "    Unfortunately, we won't answer you at this address. You should make\n"
@@ -679,10 +591,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -701,13 +615,15 @@ msgstr ""
 #~ "    courriel depuis l'un d'entre eux.\n"
 #~ "\n"
 #~ "    Nous ne nous occupons que des requÃªtes envoyÃ©es par les services de\n"
-#~ "    messagerie Ã©lectronique qui supportent \"DKIM\" qui est une fonctionnalitÃ©\n"
-#~ "    qui nous permet de vÃ©rifier que l'adresse du champ \"From\" est bien celle\n"
+#~ "    messagerie Ã©lectronique qui supportent \"DKIM\" qui est une "
+#~ "fonctionnalitÃ©\n"
+#~ "    qui nous permet de vÃ©rifier que l'adresse du champ \"From\" est bien "
+#~ "celle\n"
 #~ "    qui a envoyÃ© le courriel.\n"
 #~ "\n"
 #~ "    (Nous vous prÃ©sentons nos excuses si vous ne nous avez pas envoyÃ©\n"
-#~ "    ce courriel. Puisque votre courriel provient d'un service qui n'utilise "
-#~ "pas\n"
+#~ "    ce courriel. Puisque votre courriel provient d'un service qui "
+#~ "n'utilise pas\n"
 #~ "    DKIM, nous vous envoyons une brÃ¨ve explication et nous ignorerons\n"
 #~ "    cette adresse email pour la journÃ©e en cours.)\n"
 #~ "\n"
@@ -827,7 +743,8 @@ msgstr ""
 #~ "    SUPPORT\n"
 #~ "    =======\n"
 #~ "\n"
-#~ "    Si vous avez des questions ou que cela ne fonctionne pas, vous pouvez\n"
+#~ "    Si vous avez des questions ou que cela ne fonctionne pas, vous "
+#~ "pouvez\n"
 #~ "    contacter une vraie personne Ã  cette adresse email:\n"
 #~ "    tor-assistants@xxxxxxxxxxxxxx\n"
 #~ "\n"
@@ -860,8 +777,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -897,14 +814,18 @@ msgstr ""
 #~ "\n"
 #~ "    Si votre connection Internet bloque l'accÃ¨s au rÃ©seau Tor, vous\n"
 #~ "    aurez sans doute besoin d'une passerelle. Les passerelles-relais\n"
-#~ "    (ou \"passerelles\" en plus court) sont des relais Tor qui ne sont pas\n"
-#~ "    listÃ©s sur l'annuaire principal. Etant donnÃ© qu'il n'y a pas de liste\n"
+#~ "    (ou \"passerelles\" en plus court) sont des relais Tor qui ne sont "
+#~ "pas\n"
+#~ "    listÃ©s sur l'annuaire principal. Etant donnÃ© qu'il n'y a pas de "
+#~ "liste\n"
 #~ "    publique complÃ¨te de ces passerelles, mÃªme si votre FAI filtre les\n"
 #~ "    connexions vers les serveur Tor connus, ils ne seront sans-doute\n"
 #~ "    pas capable de bloquer toutes les passerelles.\n"
 #~ "\n"
-#~ "    Vous pouvez rÃ©cupÃ©rer une adresse de passerelle en envoyant un courriel\n"
-#~ "    contenant \"get bridges\" dans le corps du message Ã  l'adresse suivante:\n"
+#~ "    Vous pouvez rÃ©cupÃ©rer une adresse de passerelle en envoyant un "
+#~ "courriel\n"
+#~ "    contenant \"get bridges\" dans le corps du message Ã  l'adresse "
+#~ "suivante:\n"
 #~ "    bridges@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "    Il est Ã©galement possible de rÃ©cupÃ©rer des passerelles Ã  l'aide d'un\n"
@@ -953,8 +874,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -975,7 +896,8 @@ msgstr ""
 #~ "\n"
 #~ "    NOTE IMPORTANTE:\n"
 #~ "    Ce message est une partie de l'archive demandÃ©e, vous devez\n"
-#~ "    attendre d'avoir reÃ§u tous les fichiers avant de tous les sauvegarder\n"
+#~ "    attendre d'avoir reÃ§u tous les fichiers avant de tous les "
+#~ "sauvegarder\n"
 #~ "    dans le mÃªme rÃ©pertoire et de les dÃ©compresser en double-cliquant\n"
 #~ "    sur le premier fichier.\n"
 #~ "\n"
@@ -1000,14 +922,18 @@ msgstr ""
 #~ "\n"
 #~ "    Si votre connection Internet bloque l'accÃ¨s au rÃ©seau Tor, vous\n"
 #~ "    aurez sans doute besoin d'une passerelle. Les passerelles-relais\n"
-#~ "    (ou \"passerelles\" en plus court) sont des relais Tor qui ne sont pas\n"
-#~ "    listÃ©s sur l'annuaire principal. Etant donnÃ© qu'il n'y a pas de liste\n"
+#~ "    (ou \"passerelles\" en plus court) sont des relais Tor qui ne sont "
+#~ "pas\n"
+#~ "    listÃ©s sur l'annuaire principal. Etant donnÃ© qu'il n'y a pas de "
+#~ "liste\n"
 #~ "    publique complÃ¨te de ces passerelles, mÃªme si votre FAI filtre les\n"
 #~ "    connexions vers les serveur Tor connus, ils ne seront sans-doute\n"
 #~ "    pas capable de bloquer toutes les passerelles.\n"
 #~ "\n"
-#~ "    Vous pouvez rÃ©cupÃ©rer une adresse de passerelle en envoyant un courriel\n"
-#~ "    contenant \"get bridges\" dans le corps du message Ã  l'adresse suivante:\n"
+#~ "    Vous pouvez rÃ©cupÃ©rer une adresse de passerelle en envoyant un "
+#~ "courriel\n"
+#~ "    contenant \"get bridges\" dans le corps du message Ã  l'adresse "
+#~ "suivante:\n"
 #~ "    bridges@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "    Il est Ã©galement possible de rÃ©cupÃ©rer des passerelles Ã  l'aide d'un\n"
@@ -1023,8 +949,8 @@ msgstr ""
 #~ "\n"
 #~ "    Hello, This is the \"GetTor\" robot.\n"
 #~ "\n"
-#~ "    Thank you for your request. It was successfully understood. Your request "
-#~ "is\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"
@@ -1043,7 +969,8 @@ msgstr ""
 #~ "\n"
 #~ "    Bonjour, je suis le robot \"GetTor\".\n"
 #~ "\n"
-#~ "    Merci  de votre demande. Elle a Ã©tÃ© correctement comprise. Votre demande\n"
+#~ "    Merci  de votre demande. Elle a Ã©tÃ© correctement comprise. Votre "
+#~ "demande\n"
 #~ "    est actuellement en cours de traitement. Votre paquet devrait arriver "
 #~ "dans\n"
 #~ "    les prochaines dix minutes.\n"
@@ -1053,7 +980,8 @@ msgstr ""
 #~ "    service de messagerie. Essayez de rÃ©envoyer le courriel Ã  partir d'un "
 #~ "compte\n"
 #~ "    gmail.com ou yahoo.cn. Vous pouvez Ã©galement demander un paquet\n"
-#~ "    tout-en-un tor+navigateur plutÃ´t que celui qui comprend tor+navigateur+\n"
+#~ "    tout-en-un tor+navigateur plutÃ´t que celui qui comprend tor+navigateur"
+#~ "+\n"
 #~ "    messagerie instantanÃ©e car il est plus lÃ©ger.\n"
 #~ "\n"
 #~ "    Si vous avez des questions ou si cela ne fonctionne pas, vous pouvez\n"
@@ -1081,12 +1009,12 @@ msgstr ""
 #~ "    Merci de votre demande.\n"
 #~ "\n"
 #~ "    Malheureusement, nous rencontrons en ce moment des problÃ¨mes et nous\n"
-#~ "    ne sommes pas en mesure de traiter votre demande dÃ¨s maintenant. Merci\n"
+#~ "    ne sommes pas en mesure de traiter votre demande dÃ¨s maintenant. "
+#~ "Merci\n"
 #~ "    de garder patience pendant que nous tentons de rÃ©soudre ce problÃ¨me.\n"
 #~ "\n"
 #~ "        "
 
-#, python-format
 #~ msgid "Sorry, %s is not a directory."
 #~ msgstr "DÃ©solÃ©, %s n'est pas un rÃ©pertoire."
 
diff --git a/i18n/fur/gettor.po b/i18n/fur/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/fur/gettor.po
+++ b/i18n/fur/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/fy/gettor.po b/i18n/fy/gettor.po
index e7e6736..a711308 100644
--- a/i18n/fy/gettor.po
+++ b/i18n/fy/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ga/gettor.po b/i18n/ga/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ga/gettor.po
+++ b/i18n/ga/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/gl/gettor.po b/i18n/gl/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/gl/gettor.po
+++ b/i18n/gl/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/gu/gettor.po b/i18n/gu/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/gu/gettor.po
+++ b/i18n/gu/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/gun/gettor.po b/i18n/gun/gettor.po
index e7e6736..a711308 100644
--- a/i18n/gun/gettor.po
+++ b/i18n/gun/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ha/gettor.po b/i18n/ha/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ha/gettor.po
+++ b/i18n/ha/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/he/gettor.po b/i18n/he/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/he/gettor.po
+++ b/i18n/he/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/hi/gettor.po b/i18n/hi/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/hi/gettor.po
+++ b/i18n/hi/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/hr/gettor.po b/i18n/hr/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/hr/gettor.po
+++ b/i18n/hr/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ht/gettor.po b/i18n/ht/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ht/gettor.po
+++ b/i18n/ht/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/hu/gettor.po b/i18n/hu/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/hu/gettor.po
+++ b/i18n/hu/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/hy/gettor.po b/i18n/hy/gettor.po
index e7e6736..a711308 100644
--- a/i18n/hy/gettor.po
+++ b/i18n/hy/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/id/gettor.po b/i18n/id/gettor.po
index 2630f4d..7c507e5 100644
--- a/i18n/id/gettor.po
+++ b/i18n/id/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-06-22 05:27-0600\n"
 "Last-Translator: Jadied <jadied@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Hallo, Ini adalah \"getTor\" robot.\n"
@@ -31,75 +30,69 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
-"Sayangnya, kami tidak akan menjawab Anda pada alamat ini. Anda harus membuat\n"
+"Sayangnya, kami tidak akan menjawab Anda pada alamat ini. Anda harus "
+"membuat\n"
 "akun di gmail.com atau yahoo.cn dan mengirim email dari sana.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "Kami hanya memproses permohonan dari layanan email yang mendukung \"DKIM\",\n"
-"yaitu fitur email yang memungkinkan kita memverifikasi bahwa alamat yang ada\n"
+"yaitu fitur email yang memungkinkan kita memverifikasi bahwa alamat yang "
+"ada\n"
 "di \"From:\" adalah yang benar-benar mengirimkan emailnya.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(Kami mohon maaf jika Anda tidak meminta email ini. Karena email Anda\n"
 "berasal dari layanan email yang tidak menggunakan DKIM, kami mengirimkan\n"
-"penjelasan yang singkat, dan kemudian kami akan mengabaikan alamat email ini\n"
+"penjelasan yang singkat, dan kemudian kami akan mengabaikan alamat email "
+"ini\n"
 "untuk beberapa hari.)\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
-"Saat ini kami tidak dapat memproses email HTML atau mail base 64. Anda harus\n"
+"Saat ini kami tidak dapat memproses email HTML atau mail base 64. Anda "
+"harus\n"
 "mengirimkan email dalam format palin text.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Jika Anda mempunyai pertanyaan atau ada hal yang tidak bekerja, Anda dapat\n"
@@ -107,13 +100,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Kami mengirimkan paket Tor melalui email, jika Anda memberitahu kami paket\n"
@@ -122,37 +113,32 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
-"Mohon balas ke mail ini (to gettor@xxxxxxxxxxxxxx), dan beritahu kami sebuah\n"
+"Mohon balas ke mail ini (to gettor@xxxxxxxxxxxxxx), dan beritahu kami "
+"sebuah\n"
 "nama paket dimanapun di dalam email Anda.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "MENDAPATKAN VERSI LOKAL DARI TOR\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Untuk mendapatkan versi Tor yang telah diterjemahkan kedalam bahasa Anda,\n"
@@ -160,14 +146,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "Contoh berikut ini akan memberikan Anda, paket yang diminta dalam versi\n"
@@ -175,31 +159,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "daftar lokal yang didukung:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "Berikut adalah daftar semua bahasa yang tersedia:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -210,9 +189,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: Arab\n"
@@ -229,62 +206,52 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "Jika Anda tidak memilih bahasa, Anda akan menerima versi berbahasa Inggris.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "PAKET-PAKET DENGAN UKURAN KECIL\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
-"Jika bandwidth Anda kecil atau provider Anda tidak memperbolehkan Anda untuk\n"
+"Jika bandwidth Anda kecil atau provider Anda tidak memperbolehkan Anda "
+"untuk\n"
 "menerima attachment berukuran besar pada email Anda, terdapat fitur dalam\n"
 "GetTor yang memungkinkan attachment dikirim dengan ukuran yang kecil-kecil.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "Gunakan kata kunci 'split' dimanapun dalam email Anda:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "Mengirimkan teks ini sebagai email ke GetTor akan menyebabkan GetTor akan\n"
@@ -292,83 +259,59 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
-"Setelah menerima semua bagian, Anda harus menyusunnya kembali menjadi sebuah\n"
+"Setelah menerima semua bagian, Anda harus menyusunnya kembali menjadi "
+"sebuah\n"
 "paket yang utuh kembali. Hal ini dapat dilakukan sebagai berikut:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "1.) Simpan semua attachment yang diterima kedalam sebuah folder.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"2.) Unzip semua file dengan ektensi (akhiran) \".z\"Jika Anda menyimpan semua\n"
+"2.) Unzip semua file dengan ektensi (akhiran) \".z\"Jika Anda menyimpan "
+"semua\n"
 "attachment kedalam folder baru sebelumnya, unzip semua file dalam folder\n"
 "tersebut.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3.) Rename file berakhiran \".ex_RENAME\" menjadi berakhiran \".exe\" dan \n"
-"\"ex_RENAME.asc\" menjadi \".exe.asc\"\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "4). Verifikasi semua file yang diterima. (gpg --verify)\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "5.) Sekarang gunakan program yang dapat melakukan unrar multivolume RAR\n"
@@ -377,40 +320,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "Untuk membuka (unpack) paket Tor, klik ganda file \".exe\"\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
-"6.) Setelah proses selesai, Anda akan menemukan file \".exe\" baru di folder\n"
+"6.) Setelah proses selesai, Anda akan menemukan file \".exe\" baru di "
+"folder\n"
 "tujuan Anda. Klik ganda file \".exe\" baru tersebut dan TOr Browser Bundle\n"
 "akan segera berjalan.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "7.) Itu Saja. Semua selesai. Terima kasih telah menggunakan Tor dan selamat\n"
@@ -418,23 +354,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"BANTUAN\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "Ini adalah permintaan software Anda sebagai file zip. Mohon unzip paket dan\n"
@@ -442,51 +370,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
-"Petunjuk: Jika komputer Anda telah diinstall GnuPG, gunakan gpg command line\n"
+"Petunjuk: Jika komputer Anda telah diinstall GnuPG, gunakan gpg command "
+"line\n"
 "sebagai berikut:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --verify <nama paket>.asc <nama paket>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "Outputnya akan tampat seperti ini:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "Jika Anda tidak biasa menggunakan command line, Anda dapat menggunakan\n"
@@ -494,37 +404,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Jika koneksi internet Anda memblokir akses ke jaringan Tor, maka Anda\n"
-"membutuhkan bridge relay. Bridge relay (atau bridge untuk singkatnya) adalah\n"
+"membutuhkan bridge relay. Bridge relay (atau bridge untuk singkatnya) "
+"adalah\n"
 "Tor relay yang tidak didaftarkan pada direktori utama. Karena tidak ada\n"
-"daftar publik yang lengkap dari bridge, bahkan jika ISP Anda memfilter semua\n"
+"daftar publik yang lengkap dari bridge, bahkan jika ISP Anda memfilter "
+"semua\n"
 "koneksi ke semua Tor relay yang umum diketahui, ISP tidak akan mampu untuk\n"
 "memblokir semua bridge.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "Anda dapat memperoleh bridge dengan mengirimkan email yang mengandung \"get\n"
@@ -532,14 +438,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "Alternatif lain adalah dengan mengakses bridge melalui web browser dengan\n"
@@ -547,16 +450,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "CATATAN PENTING:\n"
@@ -566,13 +467,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "Paket mungkin diterima secara tidak berurutan! Pastikan bahwa Anda menerima\n"
@@ -580,16 +479,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Terima kasih atas permohonan Anda. Permohonan Anda telah dipahami.\n"
@@ -598,16 +493,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "Jika tidak juga tiba, paket mungkin terlalu besar bagi email Anda.\n"
@@ -617,15 +507,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "Maaf, kami sedang mengalami permasalahan dan kami tidak dapat melayani\n"
@@ -633,3 +519,38 @@ msgstr ""
 "ini.\n"
 "\n"
 "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3.) Rename file berakhiran \".ex_RENAME\" menjadi berakhiran \".exe\" "
+#~ "dan \n"
+#~ "\"ex_RENAME.asc\" menjadi \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "BANTUAN\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --verify <nama paket>.asc <nama paket>\n"
+#~ "\n"
+#~ "    "
diff --git a/i18n/is/gettor.po b/i18n/is/gettor.po
index 590b576..213bf00 100644
--- a/i18n/is/gettor.po
+++ b/i18n/is/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-10-03 02:50+0200\n"
 "Last-Translator: Berglind Ã?sk BergsdÃ³ttir <beggaboo85@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "HallÃ³, Ã¾etta er \"NÃ¡Ã°u Ã Tor\" vÃ©lmenniÃ°.\n"
@@ -32,28 +30,24 @@ msgstr ""
 "Takk fyrir beiÃ°nina.\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "Ã?vÃ miÃ°ur er ekki hÃ¦gt aÃ° svara Ã¾Ã©r frÃ¡ Ã¾essu netfangi. Ã?Ãº Ã¦ttir aÃ° bÃºa til\n"
 "reikning hjÃ¡ gmail.com eÃ°a yahoo.cn og senda pÃ³st frÃ¡ Ã¶Ã°rum hvorum Ã¾eirra\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "ViÃ° vinnum aÃ°eins Ãºr beiÃ°num frÃ¡ vefÃ¾jÃ³nustum sem styÃ°ja \"DKIM\", sem er\n"
@@ -62,14 +56,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(ViÃ° biÃ°jumst velvirÃ°ingar ef Ã¾Ãº baÃ°st ekki um Ã¾ennan pÃ³st. Ã?ar sem\n"
@@ -78,27 +70,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
-"Vinsamlegast athugiÃ° aÃ° eins og er getum viÃ° ekki unniÃ° Ãºr HTML vefpÃ³stum nÃ©\n"
+"Vinsamlegast athugiÃ° aÃ° eins og er getum viÃ° ekki unniÃ° Ãºr HTML vefpÃ³stum "
+"nÃ©\n"
 "base 64 pÃ³stum. Ã?Ãº verÃ°ur aÃ° senda pÃ³st meÃ° einfaldri textagerÃ°.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Ef Ã¾Ãº hefur einhverjar spurningar eÃ°a eitthvaÃ° virkar ekki, geturu haft\n"
@@ -107,13 +96,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Ã?g mun senda Ã¾Ã©r Tor-pakkann ef Ã¾Ãº segir mÃ©r hvern Ã¾Ãº vilt fÃ¡. Vinsamlegast\n"
@@ -121,13 +108,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Vinsamlegast svaraÃ°u Ã¡ Ã¾etta netfang (gettor@xxxxxxxxxxxxxx), og segÃ°u mÃ©r\n"
@@ -135,66 +120,56 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "SÃ?KI STAÃ?FÃ?RÃ?AR Ã?TGÃ?FUR AF TOR\n"
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Til Ã¾ess aÃ° fÃ¡ ÃºtgÃ¡fu af Tor Ã¾Ã½dda yfir Ã¡ Ã¾itt tungumÃ¡l, gerÃ°u grein fyrir\n"
-"hvaÃ°a tungumÃ¡l Ã¾Ãº vilt fÃ¡ hana Ã¡ Ã veffanginu Ã¾ar sem Ã¾Ãº sendir pÃ³stinn til:\n"
+"hvaÃ°a tungumÃ¡l Ã¾Ãº vilt fÃ¡ hana Ã¡ Ã veffanginu Ã¾ar sem Ã¾Ãº sendir pÃ³stinn "
+"til:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "Ã?etta dÃ¦mi mun gefa Ã¾Ã©r umbeÃ°na pakka Ã¡ staÃ°bundinni ÃºtgÃ¡fu Ã¡ kÃnversku. "
 "TÃ©kkiÃ° neÃ°ar Ã¡ lista yfir tungumÃ¡lakÃ³Ã°a sem eru studdir."
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 " Listi yfir studdar staÃ°fÃ¦rslur:\n"
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
-"	HÃ©r er listi yfir Ã¶ll tiltÃ¦k tungumÃ¡l:\n"
+"\tHÃ©r er listi yfir Ã¶ll tiltÃ¦k tungumÃ¡l:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -205,9 +180,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: ArabÃska\n"
@@ -224,105 +197,89 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
-"	Ef ekkert tungumÃ¡l er valiÃ° muntu fÃ¡ ensku ÃºtgÃ¡funa.\n"
+"\tEf ekkert tungumÃ¡l er valiÃ° muntu fÃ¡ ensku ÃºtgÃ¡funa.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
-"	MINNI STÃ?RÃ? AF PÃ?KKUM\n"
+"\tMINNI STÃ?RÃ? AF PÃ?KKUM\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
-"	Ef bandvÃddin Ã¾Ãn er lÃ¡g eÃ°a Ã¾Ãº hefur ekkivÃ¶l Ã¡ aÃ° fÃ¡ stÃ³r viÃ°hengi meÃ°\n"
-"	tÃ¶lvupÃ³sti, er virkni Ã GetTor sem hÃ¦gt er aÃ° nota til aÃ° fÃ¡ send fjÃ¶lda\n"
-"	smÃ¦rri pakka Ã staÃ°inn fyrir einn stÃ³rann.\n"
+"\tEf bandvÃddin Ã¾Ãn er lÃ¡g eÃ°a Ã¾Ãº hefur ekkivÃ¶l Ã¡ aÃ° fÃ¡ stÃ³r viÃ°hengi meÃ°\n"
+"\ttÃ¶lvupÃ³sti, er virkni Ã GetTor sem hÃ¦gt er aÃ° nota til aÃ° fÃ¡ send fjÃ¶lda\n"
+"\tsmÃ¦rri pakka Ã staÃ°inn fyrir einn stÃ³rann.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
-"	Einfaldlega settu inn lykilorÃ°iÃ° 'split' einhvers staÃ°ar Ã tÃ¶lvupÃ³stinn Ã¾inn\n"
-"	lÃkt og:\n"
+"\tEinfaldlega settu inn lykilorÃ°iÃ° 'split' einhvers staÃ°ar Ã tÃ¶lvupÃ³stinn "
+"Ã¾inn\n"
+"\tlÃkt og:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
-"	MeÃ° Ã¾vÃ aÃ° senda Ã¾ennan texta meÃ° tÃ¶lvupÃ³sti mun GetTor senda Ã¾Ã©r Tor-\n"
-"	vafrara-pakkann Ã fjÃ¶lda 1.4 MB viÃ°hengjum.\n"
+"\tMeÃ° Ã¾vÃ aÃ° senda Ã¾ennan texta meÃ° tÃ¶lvupÃ³sti mun GetTor senda Ã¾Ã©r Tor-\n"
+"\tvafrara-pakkann Ã fjÃ¶lda 1.4 MB viÃ°hengjum.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
-"Eftir aÃ° hafa fengiÃ° alla parta Ã¾arftu aÃ° setja Ã¾Ã¡ aftur saman Ã einn pakka.\n"
+"Eftir aÃ° hafa fengiÃ° alla parta Ã¾arftu aÃ° setja Ã¾Ã¡ aftur saman Ã einn "
+"pakka.\n"
 "Ã?aÃ° er gert eftirfarandi:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "1.) VistaÃ°u Ã¶ll viÃ°hengi Ã eina mÃ¶ppu Ã¡ diskinn Ã¾inn.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
 "2.) AfÃ¾jappaÃ°u allar skrÃ¡r sem enda Ã¡ \".z\". Ef Ã¾Ãº vistaÃ°ir Ã¶ll viÃ°hengi Ã "
@@ -330,44 +287,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3.) Breyttu nafninu Ã¡ skrÃ¡nni sem hefur endinguna \".ex_RENAME\" yfir Ã \".exe\" "
-"og \n"
-"breyttu einnig nafninu Ã¡ skrÃ¡nni hefur endinguna \".ex.RENAME.asc\" yfir Ã \n"
-"\".exe.asc\"\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "4.) SannprÃ³faÃ°u allar skrÃ¡r eins og lÃ½st er Ã pÃ³stinum sem Ã¾Ãº fÃ©kkst meÃ° \n"
 "hverjum pakka. (gpg --verify)\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 " 5.) NotaÃ°u nÃºna forrit sem getur afÃ¾jappaÃ° RAR- skrÃ¡r.Ã?\n"
@@ -375,170 +311,119 @@ msgstr ""
 "Ã¾inni geturu nÃ¡Ã° Ã Ã¾aÃ° hÃ©r: \n"
 "\n"
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 " Til aÃ° afÃ¾jappa Tor-pakkanum Ã¾Ãnum, einfaldlega tvÃklikkaÃ°u Ã¡ .exe skrÃ¡na.\n"
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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:"
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\n"
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:525
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\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."
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:531
 msgid ""
-"\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 arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:534
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:538
 msgid ""
-"\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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 
-#: lib/gettor/constants.py:657
-msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
-msgstr ""
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3.) Breyttu nafninu Ã¡ skrÃ¡nni sem hefur endinguna \".ex_RENAME\" yfir Ã "
+#~ "\".exe\" og \n"
+#~ "breyttu einnig nafninu Ã¡ skrÃ¡nni hefur endinguna \".ex.RENAME.asc\" yfir "
+#~ "Ã \n"
+#~ "\".exe.asc\"\n"
+#~ "\n"
+#~ "    "
diff --git a/i18n/it/gettor.po b/i18n/it/gettor.po
index e47160c..e18a6fd 100644
--- a/i18n/it/gettor.po
+++ b/i18n/it/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-11-20 19:57+0200\n"
 "Last-Translator: ringmeister84 <ringmeister84@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Ciao, sono il robot \"GetTor\".\n"
@@ -32,29 +30,26 @@ msgstr ""
 "Ti ringrazio per la richiesta.\n"
 "\n"
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
-"Sfortunatamente, non ti risponderemo a questo indirizzo. Dovresti registrare\n"
+"Sfortunatamente, non ti risponderemo a questo indirizzo. Dovresti "
+"registrare\n"
 "un indirizzo con GMAIL.COM o YAHOO.CN e spedire la mail da\n"
 "uno di questi.\n"
 "\n"
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "Accettiamo rihieste solo da provider email che supportano \"DKIM\"\n"
@@ -62,14 +57,12 @@ msgstr ""
 "campo \"From\" Ã¨ realmente quello che spedisce la mail.\n"
 "\n"
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(Ci scusiamo se non hai richiesto questa mail. Dato che la tua email "
@@ -80,13 +73,11 @@ msgstr ""
 "successivi).\n"
 "\n"
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "Per favore nota che attualmente, non possiamo processare email HTML o base "
@@ -94,105 +85,87 @@ msgstr ""
 "E' necessario spedire in testo semplice.\n"
 "\n"
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Se hai qualche domanda o malfunzionamenti, Ã¨ possibile contattare una\n"
 "persona a questo indirizzo: tor-assistants@xxxxxxxxxxxxxx\n"
 "\n"
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Ti spedirÃ² via mail un pacchetto Tor, se mi dici quale vuoi.\n"
 "Per favore seleziona uno dei seguenti nomi di pacchetti:\n"
 "\n"
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Per favore rispondi a questa mail (a gettor@xxxxxxxxxxxxxx), e dimmi\n"
 "un singolo nome di pacchetto ovunque nel corpo della tua email.\n"
 "\n"
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "OTTENENDO LE VERSIONI LOCALIZZATE DI TOR\n"
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 #, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Per ottenere una versione di Tor tradotta nella tua lingua, specifica il\n"
 "linguaggio che vuoi nell'indirizzo a cui spedisci la mail:\n"
 "\n"
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "Questo esempio ti ritornerÃ  il pacchetto richiesto nella versione "
 "localizzata\n"
 "per il Cinese. Controlla sotto per una lista dei codici lingua supportati.\n"
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Lista delle localizzazioni supportate:\n"
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "Qui trovi una lista di tutti i linguaggi disponibili:\n"
 "\n"
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -203,9 +176,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: Arabo\n"
@@ -221,35 +192,28 @@ msgstr ""
 "gettor+zh@xxxxxxxxxxxxxx: Cinese\n"
 "\n"
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "Se non selezioni alcun linguaggio, riceverai la versione Inglese.\n"
 "\n"
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "PACCHETTI CON DIMENSIONE RIDOTTA\n"
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "Se la tua banda Ã¨ bassa o il tuo provider non ti permette di \n"
@@ -258,246 +222,147 @@ msgstr ""
 "invece di uno grande.\n"
 "\n"
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "Includi semplicemente la parola chiave 'split' in qualche parte della tua "
 "email:\n"
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "Spedire questo testo in una email verso GetTor causerÃ  la spedizione \n"
 "del Tor Browser Bundle in una serie di allegati da 1,4MB.\n"
 "\n"
 
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ja/gettor.po b/i18n/ja/gettor.po
index 1f61bbd..9de21ad 100644
--- a/i18n/ja/gettor.po
+++ b/i18n/ja/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-04-10 01:48-0600\n"
 "Last-Translator: Shinji R. Yamane <s-yamane@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "    ã??ã??ã?«ã?¡ã??ã??ã??ã?¡ã??ã?¯\"GetTor\"è?ªå??è¿?ä¿¡ã?ã??ã??ã??ã?§ã??ã??\n"
@@ -31,29 +30,27 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
-"    ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??ã??ã??ã??ã?®ã?¢ã??ã?¬ã?¹ã?§ã?¯ã??ã?ªã??æ§?ã?«å??ç?ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??ã??\n"
-"    GMAIL.COM ã?¾ã??ã?¯ YAHOO.CN ã?«ã?¢ã?«ã?¦ã?³ã??ã??ä½?æ??ã??ã?¦ã??ã?®ã?©ã?¡ã??ã??ä¸?ã?¤ã??ã??ã?¡ã?¼ã?«ã??ã??é??ã??ã??ã? ã??ã??ã??\n"
+"    ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??ã??ã??ã??ã?®ã?¢ã??ã?¬ã?¹ã?§ã?¯ã??ã?ªã??æ§?ã?«å??ç?ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??"
+"ã??ã??\n"
+"    GMAIL.COM ã?¾ã??ã?¯ YAHOO.CN ã?«ã?¢ã?«ã?¦ã?³ã??ã??ä½?æ??ã??ã?¦ã??ã?®ã?©ã?¡ã??ã??ä¸?ã?¤ã??ã??ã?¡ã?¼"
+"ã?«ã??ã??é??ã??ã??ã? ã??ã??ã??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "    ç§?ã??ã?¡ã?¯\"DKIM\"ã??ã?µã??ã?¼ã??ã??ã??ã?¡ã?¼ã?«ã? ã??ã??å?¦ç??ã??ã?¾ã??ã??\n"
@@ -62,60 +59,50 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "    ã??ã??ã??ã??è³ªå??ã??ã??ã??å ´å??ã??å??ä½?ã??ã?ªã??å ´å??ã?«ã?¯ã??ä»¥ä¸?ã?®ã?¡ã?¼ã?«\n"
-"    ã?¢ã??ã?¬ã?¹ã?§ç?¸è«?å?¡ã?«ã?³ã?³ã?¿ã?¯ã??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??: tor-assistants@xxxxxxxxxxxxxx\n"
+"    ã?¢ã??ã?¬ã?¹ã?§ç?¸è«?å?¡ã?«ã?³ã?³ã?¿ã?¯ã??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??: tor-"
+"assistants@xxxxxxxxxxxxxx\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
-"    ã?©ã??ã??å¿?è¦?ã??æ??ç¤ºã??ã?¦ã??ã??ã? ã??ã??ã?°ã??ã?®ã?¡ã?»ã?©Torã??ã??ã?±ã?¼ã?¸ã??ã?¡ã?¼ã?«ã?§ã??é??ã??ã??ã?¾ã??ã??\n"
+"    ã?©ã??ã??å¿?è¦?ã??æ??ç¤ºã??ã?¦ã??ã??ã? ã??ã??ã?°ã??ã?®ã?¡ã?»ã?©Torã??ã??ã?±ã?¼ã?¸ã??ã?¡ã?¼ã?«ã?§ã??é??ã??ã??"
+"ã?¾ã??ã??\n"
 "    ä»¥ä¸?ã?®ã??ã??ã?±ã?¼ã?¸å??ã??ã??ä¸?ã?¤ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    ã??ã?®ã?¡ã?¼ã?«ã?®é??ä¿¡å?? (gettor@xxxxxxxxxxxxxx)ã?«è¿?ä¿¡ã??ã?¦ã??\n"
@@ -123,23 +110,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "    ã??Torã?®ã?ã?¼ã?«ã?©ã?¤ã?ºç??ã??å?¥æ??ã??ã??ã??\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "    ã??ã?ªã??ã?®ä½¿ã??è¨?èª?ã?«ç¿»è¨³ã??ã??ã??Torã??ä½¿ã??ã?«ã?¯ã??ä»¥ä¸?ã?®ã??ã??ã?«\n"
@@ -147,41 +130,32 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "    ã?µã??ã?¼ã??ã??ã??ã?ã?«ã?¼ã?«ã?ªã?¹ã??:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "    ä»¥ä¸?ã?¯å?©ç?¨å?¯è?½ã?ªè¨?èª?ã?®ã?ªã?¹ã??ã?§ã??:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -192,238 +166,144 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "    ã??ã??ã??è¨?èª?ã??æ??å®?ã??ã?ªã??å ´å??ã?¯ã??è?±èª?ã??ã?¼ã?¸ã?§ã?³ã??å??ã??å??ã??ã??ã?¨ã?«ã?ªã??ã?¾ã??ã??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "    ã??è»½é??ç??ã?®ã??ã??ã?±ã?¼ã?¸ã??\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:545
-msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:569
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
-"\n"
-"    ã??ã?µã??ã?¼ã??ã??\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:504
 msgid ""
-"\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:585
-msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    The output should look somewhat like this:\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."
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"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:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:620
-msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\n"
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:631
-msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    ã??æ³¨æ??äº?é ?ã??\n"
@@ -434,51 +314,43 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
-"    ç?³ã??è¨³ã??ã??ã?¾ã??ã??ã??ã??ã??ã? ã??ã?¾å??é¡?ç?ºç??ä¸ã?«ã?¤ã??ã??ã??å??ã??å??ã??ã??ã?«ã?¯ã??ã??ã?«å¯¾å¿?ã?§ã??ã?¾ã??ã??ã??\n"
+"    ç?³ã??è¨³ã??ã??ã?¾ã??ã??ã??ã??ã??ã? ã??ã?¾å??é¡?ç?ºç??ä¸ã?«ã?¤ã??ã??ã??å??ã??å??ã??ã??ã?«ã?¯ã??ã??ã?«å¯¾å¿?"
+"ã?§ã??ã?¾ã??ã??ã??\n"
 "    ç§?ã??ã?¡ã??ã??ã?®å??é¡?ã??è§£æ±ºã??ã??ã?¾ã?§ã??ã??å¾?ã?¡ã??ã? ã??ã??ã??ã??ã??é¡?ã??è?´ã??ã?¾ã??ã??\n"
 "\n"
 "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    ã??ã?µã??ã?¼ã??ã??\n"
+#~ "    "
diff --git a/i18n/jv/gettor.po b/i18n/jv/gettor.po
index e7e6736..a711308 100644
--- a/i18n/jv/gettor.po
+++ b/i18n/jv/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ka/gettor.po b/i18n/ka/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/ka/gettor.po
+++ b/i18n/ka/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/km/gettor.po b/i18n/km/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/km/gettor.po
+++ b/i18n/km/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/kn/gettor.po b/i18n/kn/gettor.po
index e7e6736..a711308 100644
--- a/i18n/kn/gettor.po
+++ b/i18n/kn/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ko/gettor.po b/i18n/ko/gettor.po
index d281ba6..998e059 100644
--- a/i18n/ko/gettor.po
+++ b/i18n/ko/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-05-16 18:54-0600\n"
 "Last-Translator: vangelis <vangelis@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "ì??ë??í??ì?¸ì??, ì ?ë?? \"GetTor\" ë¡?ë´?ì??ë??ë?¤.\n"
@@ -31,14 +30,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "ì? ê°?ì?¤ë?½ì§?ë§?, ì?°ë¦¬ë?? ì?´ ì£¼ì??ë¡? ë?¹ì? ê»? ë??ë?µí??ì§? ì??ì?? ê²?ì??ë??ë?¤.\n"
@@ -47,30 +44,27 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "ì?°ë¦¬ë?? \"DKIM\"ì?? ì§?ì??í??ë?? ì?´ë©?ì?¼ ì??ë²?ì?¤ë¡?ë¶?í?° ì?¨ ì??ì²ë§? ì²?ë¦¬í??ë©°,\n"
-"\"DKIM\"ì?? \"From\" ë?¼ì?¸ì?? ì??ë?? ì£¼ì??ê°? ì?¤ì ?ë¡? ê·¸ ë©?ì?¼ì?? ë³´ë?¸ ì?¬ë??ì?? ê²?ì?¸ì§?ë¥¼\n"
+"\"DKIM\"ì?? \"From\" ë?¼ì?¸ì?? ì??ë?? ì£¼ì??ê°? ì?¤ì ?ë¡? ê·¸ ë©?ì?¼ì?? ë³´ë?¸ ì?¬ë??ì?? ê²?ì?¸ì§?"
+"ë¥¼\n"
 "ì?°ë¦¬ê°? í??ì?¸í??ê²? í?´ì£¼ë?? ì?´ë©?ì?¼ ê¸°ë?¥ì??ë??ë?¤.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(ë?¹ì? ì?´ ì?´ ë©?ì?¼ì?? ì??ì²í??ì§? ì??ì??ë?¤ë©´ ì?¬ê³¼ë??ë¦½ë??ë?¤.\n"
@@ -80,86 +74,57 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -170,270 +135,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:499
-msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ku/gettor.po b/i18n/ku/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/ku/gettor.po
+++ b/i18n/ku/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/kw/gettor.po b/i18n/kw/gettor.po
index e7e6736..a711308 100644
--- a/i18n/kw/gettor.po
+++ b/i18n/kw/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ky/gettor.po b/i18n/ky/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ky/gettor.po
+++ b/i18n/ky/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/lb/gettor.po b/i18n/lb/gettor.po
index e7e6736..a711308 100644
--- a/i18n/lb/gettor.po
+++ b/i18n/lb/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/lg/gettor.po b/i18n/lg/gettor.po
index e7e6736..a711308 100644
--- a/i18n/lg/gettor.po
+++ b/i18n/lg/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ln/gettor.po b/i18n/ln/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ln/gettor.po
+++ b/i18n/ln/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/lo/gettor.po b/i18n/lo/gettor.po
index e7e6736..a711308 100644
--- a/i18n/lo/gettor.po
+++ b/i18n/lo/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/lt/gettor.po b/i18n/lt/gettor.po
index e7e6736..a711308 100644
--- a/i18n/lt/gettor.po
+++ b/i18n/lt/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/lv/gettor.po b/i18n/lv/gettor.po
index e7e6736..a711308 100644
--- a/i18n/lv/gettor.po
+++ b/i18n/lv/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/mg/gettor.po b/i18n/mg/gettor.po
index e7e6736..a711308 100644
--- a/i18n/mg/gettor.po
+++ b/i18n/mg/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/mi/gettor.po b/i18n/mi/gettor.po
index e7e6736..a711308 100644
--- a/i18n/mi/gettor.po
+++ b/i18n/mi/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/mk/gettor.po b/i18n/mk/gettor.po
index e7e6736..a711308 100644
--- a/i18n/mk/gettor.po
+++ b/i18n/mk/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ml/gettor.po b/i18n/ml/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ml/gettor.po
+++ b/i18n/ml/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/mn/gettor.po b/i18n/mn/gettor.po
index e7e6736..a711308 100644
--- a/i18n/mn/gettor.po
+++ b/i18n/mn/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/mr/gettor.po b/i18n/mr/gettor.po
index e7e6736..a711308 100644
--- a/i18n/mr/gettor.po
+++ b/i18n/mr/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ms/gettor.po b/i18n/ms/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ms/gettor.po
+++ b/i18n/ms/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/mt/gettor.po b/i18n/mt/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/mt/gettor.po
+++ b/i18n/mt/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/nah/gettor.po b/i18n/nah/gettor.po
index e7e6736..a711308 100644
--- a/i18n/nah/gettor.po
+++ b/i18n/nah/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/nap/gettor.po b/i18n/nap/gettor.po
index e7e6736..a711308 100644
--- a/i18n/nap/gettor.po
+++ b/i18n/nap/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/nb/gettor.po b/i18n/nb/gettor.po
index 3c16b81..664f24a 100644
--- a/i18n/nb/gettor.po
+++ b/i18n/nb/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-07-23 17:41+0200\n"
 "Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,126 +17,85 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -147,272 +106,159 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 
 #~ msgid ""
@@ -424,10 +270,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -453,8 +301,8 @@ msgstr ""
 #~ "en tjeneste som ikke stÃ¸tter DKIM, sender vi en kort forklaring,\n"
 #~ "og deretter vil vi ignorere denne epostadressen i et par dager).\n"
 #~ "\n"
-#~ "Vennligst merk at forelÃ¸pig kan vi ikke gjennomfÃ¸re eposter med HTML eller "
-#~ "base 64\n"
+#~ "Vennligst merk at forelÃ¸pig kan vi ikke gjennomfÃ¸re eposter med HTML "
+#~ "eller base 64\n"
 #~ "Du er nÃ¸dt til Ã¥ sende Ã©n i ren tekst.\n"
 #~ "\n"
 #~ "Hvis du har noen spÃ¸rsmÃ¥l eller det ikke virker, kan du kontakte et\n"
@@ -541,7 +389,8 @@ msgstr ""
 #~ "gettor+zh@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "Dette eksempelet vil gi deg en forespurt pakke som er en oversatt\n"
-#~ "versjon for kinesisk. Se listen nedenfor for hvilke sprÃ¥k det er stÃ¸tte for.\n"
+#~ "versjon for kinesisk. Se listen nedenfor for hvilke sprÃ¥k det er stÃ¸tte "
+#~ "for.\n"
 #~ "\n"
 #~ "Liste av stÃ¸ttede sprÃ¥k:\n"
 #~ "-------------------------\n"
diff --git a/i18n/ne/gettor.po b/i18n/ne/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ne/gettor.po
+++ b/i18n/ne/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/nl/gettor.po b/i18n/nl/gettor.po
index 0aef36f..dc9d218 100644
--- a/i18n/nl/gettor.po
+++ b/i18n/nl/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-04-09 14:54-0600\n"
 "Last-Translator: wessel <wessel90@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 " Hallo, dit is de \"GetTor\" robot.\n"
@@ -30,14 +29,12 @@ msgstr ""
 "Dank u voor uw verzoek.\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "Het spijt ons u te moeten mededelen dat wij geen antwoord geven op dit "
@@ -46,14 +43,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "We nemen alleen verzoeken van e-mail diensten aan die \n"
@@ -63,14 +58,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 " (Ons excuses als u niet om dit bericht heeft gevraagd. Omdat uw \n"
@@ -80,28 +73,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
-"Houd er alstublieft rekening mee dat we op het moment geen HTML of base-64 "
-"e-mails kunnen accepteren. \n"
+"Houd er alstublieft rekening mee dat we op het moment geen HTML of base-64 e-"
+"mails kunnen accepteren. \n"
 "U zult gewone text (plain text) e-mails moeten versturen.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Voor vragen kunt u contact opnemen met tor-assistants@xxxxxxxxxxxxxx\n"
@@ -109,13 +98,11 @@ msgstr ""
 "Neem in achting dat de voertaal Engels is. \n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Ik zal u een Tor paket sturen als u vertelt welke u wilt. \n"
@@ -123,13 +110,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Antwoord op dit e-mailadres (gettor@xxxxxxxxxxxxxx), en noem in de body van "
@@ -137,24 +122,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "Bezig met het verkrijgen van gelokaliseerde versies van Tor.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Om een taalspecifieke versie van Tor te verkrijgen, \n"
@@ -162,46 +143,40 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
-"Dit voorbeeld geeft u een pakket in een gelokaliseerde versie voor Chinees. \n"
+"Dit voorbeeld geeft u een pakket in een gelokaliseerde versie voor "
+"Chinees. \n"
 " Onderaan vind u een lijst met ondersteunde taalcodes.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Lijst van ondersteunde gelokaliseerde versies: \n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "Hier is een lijst van alle beschikbare talen: \n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -212,9 +187,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: Arabisch \n"
@@ -231,37 +204,30 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "Indien u geen taal specificeert, ontvangt u de Engelse versie. \n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "PAKKETTEN MET KLEINERE GROOTTE\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "Indien u weinig bandbreedte heeft of een provider heeft die\n"
@@ -270,23 +236,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "Neem in uw e-mail het woord 'split' op, zoals hier voorgedaan:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "Indien u deze tekst meestuurt in een e-mail aan GetTor, zorgt die ervoor\n"
@@ -294,13 +256,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "Nadat u alle onderdelen heeft onvangen, moet u deze combineren tot \n"
@@ -309,25 +269,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "1.) Sla alle bijlagen op in een en dezelfde map op uw harde schijf. \n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
 "2. Unzip alle bestanden die eindigen op \".z\". Als u een nieuwe map heeft "
@@ -336,29 +291,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3.) Hernoem het bestand dat eindigt op \".ex_RENAME\" naar \".exe\" en \n"
-"hernoem eveneens het bestand dat eindigt op \".ex_RENAME.asc\" naar \n"
-"\".exe.asc\"\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "4.) Controleer alle bestanden zoals beschreven in de e-mail die u ontvangen "
@@ -366,14 +303,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "5.) Gebruik nu een programma die meerdere archieven kan unrarren.\n"
@@ -382,12 +317,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "Om uw Tor pakket uit te pakken dubbel-klikt u simpelweg op het \".exe\" "
@@ -395,14 +327,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "6.) Als het uitpakken klaar is, vind u een nieuw \n"
@@ -411,12 +341,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "7.) U bent klaar met installeren. Dank u voor het gebruik van Tor en veel "
@@ -424,23 +351,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"ONDERSTEUNING \n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "Hier is uw gevraagde software als een zip bestand. Unzip het pakket en "
@@ -448,13 +367,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "Hint: Als u computer GnuPG heeft, gebruik dan de commandline tool als volgt "
@@ -462,37 +379,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --verify <pakketnaam>.asc <pakketnaam>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "De output zou ietwat op dit moeten lijken:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "Als u niet betekent bent met commandline tools, probeer dan te zoeken naar "
@@ -500,17 +400,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Als uw internet verbinding toegang tot het Tor netwerk blokkeert, \n"
@@ -522,31 +420,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "U kunt een bridge verkrijgen door een e-mail te sturen naar: "
 "bridges@xxxxxxxxxxxxxx\n"
 "Vermeld hierbij \"get bridges\"\n"
-" in de body van uw bericht."
-"    "
+" in de body van uw bericht.    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "Het is ook mogelijk om bridges te verkrijgen via onderstaande url: \n"
@@ -554,16 +444,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "BELANGRIJK: \n"
@@ -574,13 +462,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "Pakketen kunnen ontvangen worden in verkeerde volgorde! Zorg ervoor dat u "
@@ -588,16 +474,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Dank u voor uw verzoek. Uw verzoek is begrepen en wordt momenteel verwerkt. "
@@ -605,16 +487,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "Als het pakket niet ontvangen wordt, is het pakket mogelijk te groot voor uw "
@@ -625,15 +502,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "Helaas zijn er momenteel technische problemen en kunnen we uw verzoek niet "
@@ -644,6 +517,41 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3.) Hernoem het bestand dat eindigt op \".ex_RENAME\" naar \".exe\" en \n"
+#~ "hernoem eveneens het bestand dat eindigt op \".ex_RENAME.asc\" naar \n"
+#~ "\".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "ONDERSTEUNING \n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --verify <pakketnaam>.asc <pakketnaam>\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
 #~ "\n"
 #~ "    Unfortunately, we won't answer you at this address. You should make\n"
@@ -651,10 +559,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
diff --git a/i18n/nn/gettor.po b/i18n/nn/gettor.po
index e7e6736..a711308 100644
--- a/i18n/nn/gettor.po
+++ b/i18n/nn/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/nso/gettor.po b/i18n/nso/gettor.po
index e7e6736..a711308 100644
--- a/i18n/nso/gettor.po
+++ b/i18n/nso/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/oc/gettor.po b/i18n/oc/gettor.po
index e7e6736..a711308 100644
--- a/i18n/oc/gettor.po
+++ b/i18n/oc/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/or/gettor.po b/i18n/or/gettor.po
index e7e6736..a711308 100644
--- a/i18n/or/gettor.po
+++ b/i18n/or/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/pa/gettor.po b/i18n/pa/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/pa/gettor.po
+++ b/i18n/pa/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/pap/gettor.po b/i18n/pap/gettor.po
index e7e6736..a711308 100644
--- a/i18n/pap/gettor.po
+++ b/i18n/pap/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/pl/gettor.po b/i18n/pl/gettor.po
index 8149fb0..7b338c3 100644
--- a/i18n/pl/gettor.po
+++ b/i18n/pl/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GetTor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-04-27 11:30-0700\n"
 "Last-Translator: Bogdan Drozdowski <bogdan / op . pl>\n"
 "Language-Team: pl\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "    Witaj, Tu robot \"GetTor\".\n"
@@ -31,14 +30,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "    Niestety, nie odpowiemy Ci na ten adres. PowinieneÅ?/aÅ? zaÅ?oÅ¼yÄ?\n"
@@ -47,14 +44,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "    Przetwarzamy tylko Å¼Ä?dania z usÅ?ug e-mail, ktÃ³re obsÅ?ugujÄ? \"DKIM\",\n"
@@ -63,14 +58,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "    (Przeprawszamy, jeÅ?li nie prosiÅ?eÄ?/aÅ? o ten list. Skoro TwÃ³j adres \n"
@@ -79,13 +72,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "    Aktualnie nie moÅ¼emy przetwarzaÄ? listÃ³w w formacie HTML lub base 64.\n"
@@ -93,13 +84,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "    JeÅ?li masz pytania lub to nie dziaÅ?a, moÅ¼esz skontaktowaÄ? siÄ? z\n"
@@ -107,13 +96,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "    WyÅ?lÄ? Ci paczkÄ? z Torem, jeÅ?li powiesz, ktÃ³rÄ? chcesz.\n"
@@ -121,13 +108,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    ProszÄ? odpisz na ten list (na gettor@xxxxxxxxxxxxxx), i podaj mi\n"
@@ -135,23 +120,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "    OTRZYMYWANIE PRZETÅ?UMACZONYCH WERSJI TORA\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "    Aby otrzymaÄ? wersjÄ? Tora przetÅ?umaczonÄ? na TwÃ³j jÄ?zyk, podaj Å¼Ä?dany\n"
@@ -159,14 +140,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "    Ten przykÅ?ad da Ci Å¼Ä?danÄ? paczkÄ? w wersji pzretÅ?umaczonej\n"
@@ -175,31 +154,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "    Lista obsÅ?ugiwanych tÅ?umaczeÅ?:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "    Oto lista wszystkich dostÄ?pnych jÄ?zykÃ³w:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -210,9 +184,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabski\n"
@@ -229,37 +201,30 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "    JeÅ?li nie wybrano jÄ?zyka, otrzymasz wersjÄ? angielskÄ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "    PACZKI O MNIEJSZYCH ROZMIARACH\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "    JeÅ?li przepustowoÅ?Ä? Twojego Å?Ä?cza jest niska lub TwÃ³j dostawca \n"
@@ -269,23 +234,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "    Po prostu doÅ?Ä?cz sÅ?owo 'split' gdzieÅ? w swoim liÅ?cie, o tak:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "    WysÅ?anie tego tekstu w wiadomoÅ?ci do GetTor sprawi, Å¼e przyÅ?le Ci on \n"
@@ -293,13 +254,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "    Po otrzymaniu wszystkich czÄ?Å?ci, musisz je ponownie poskÅ?adaÄ? do \n"
@@ -307,25 +266,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "    1.) Zapisz wszystkie otrzymane zaÅ?Ä?czniki do jednego folderu na dysku.\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
 "    2.) Rozpakuj wszystkie pliki zakonczone na \".z\". JeÅ?li zapisaÅ?eÅ?/aÅ?\n"
@@ -334,29 +288,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"    3.) ZmieÅ? nazwÄ? pliku zakoÅ?czonego na \".ex_RENAME\", aby koÅ?czyÅ?a siÄ? \n"
-"        na \".exe\" i zmieÅ? nazwÄ? pliku zakoÅ?czonego na \".ex_RENAME.asc\",\n"
-"        aby koÅ?czyÅ?a siÄ? na \".exe.asc\"\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "    4.) SprawdÅº wszystkie pliki tak, jak to opisano w liÅ?cie otrzymanym \n"
@@ -364,14 +300,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "    5.) Teraz uÅ¼yj programu, ktÃ³ry moÅ¼e rozpakowaÄ? wieloczÄ?Å?ciowe archiwa\n"
@@ -380,12 +314,9 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "        Aby rozpakowaÄ? paczkÄ? Tora, po prostu kliknij dwukrotnie plik \n"
@@ -393,14 +324,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "    6.) Gdy rozpakowywanie siÄ? zakoÅ?czy, w folderze docelowym znajdzie siÄ? \n"
@@ -409,35 +338,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "    7.) Tylko tyle. Koniec. DziÄ?kujemy za uÅ¼ywanie Tora i miÅ?ej zabawy!\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"    WSPARCIE\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "    Oto zaÅ¼Ä?dane przez Ciebie oprogramowanie jako plik zip. ProszÄ? \n"
@@ -445,13 +363,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "    WskazÃ³wka: JeÅ?li na Twoim komputerze jest zainstalowany GnuPG, uÅ¼yj\n"
@@ -460,37 +376,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "    Wynik powinien wyglÄ?daÄ? podobnie do tego:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "    JeÅ?li nie znasz narzÄ?dzi linii poleceÅ?, sprÃ³buj znaleÅºÄ?\n"
@@ -498,17 +397,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    JeÅ?li Twoje poÅ?Ä?czenie z Internetem blokuje dostÄ?p do sieci Tora, \n"
@@ -521,15 +418,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "    Mostek moÅ¼esz otrzymaÄ?, wysyÅ?ajÄ?c e-mail zawierajÄ?cy \"get bridges\"\n"
@@ -538,14 +431,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "    MoÅ¼na rÃ³wnieÅ¼ pobraÄ? mostki przeglÄ?darkÄ? internetowÄ? pod  nastÄ?pujÄ?cym\n"
@@ -553,16 +443,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    WAÅ»NA UWAGA:\n"
@@ -572,13 +460,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "    Paczki mogÄ? przychodziÄ? w zÅ?ej kolejnoÅ?ci! Upewnij siÄ?, Å¼e masz\n"
@@ -586,16 +472,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    DziÄ?kujemy za Twoje Å¼Ä?danie. ZostaÅ?o ono zrozumiane pomyÅ?lnie. Twoje "
@@ -606,16 +488,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "    JeÅ?li nie przyjdzie, moÅ¼e byÄ? zbyt duÅ¼a dla Twojego dostawcy poczty.\n"
@@ -626,15 +503,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "    Niestety, w chwili obecnej mamy problemyi nie moÅ¼emy teraz wypeÅ?niÄ?\n"
@@ -642,3 +515,40 @@ msgstr ""
 "    ten problem.\n"
 "\n"
 "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    3.) ZmieÅ? nazwÄ? pliku zakoÅ?czonego na \".ex_RENAME\", aby koÅ?czyÅ?a "
+#~ "siÄ? \n"
+#~ "        na \".exe\" i zmieÅ? nazwÄ? pliku zakoÅ?czonego na \".ex_RENAME.asc"
+#~ "\",\n"
+#~ "        aby koÅ?czyÅ?a siÄ? na \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    WSPARCIE\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
diff --git a/i18n/pms/gettor.po b/i18n/pms/gettor.po
index e7e6736..a711308 100644
--- a/i18n/pms/gettor.po
+++ b/i18n/pms/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ps/gettor.po b/i18n/ps/gettor.po
index b022540..f53f143 100644
--- a/i18n/ps/gettor.po
+++ b/i18n/ps/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/pt/gettor.po b/i18n/pt/gettor.po
index a76b527..aeefb29 100644
--- a/i18n/pt/gettor.po
+++ b/i18n/pt/gettor.po
@@ -6,135 +6,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2009-12-13 12:53-0700\n"
 "Last-Translator: Tiago Faria <gouki@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -145,273 +105,170 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:545
-msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:569
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:504
 msgid ""
-"\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:585
-msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    The output should look somewhat like this:\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."
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"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:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:525
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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."
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
-
-#: lib/gettor/constants.py:650
-msgid ""
 "\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
+"OlÃ¡! Este Ã© o robot \"GetTor\".\n"
 "\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:657
-msgid ""
+"Obrigado pelo seu pedido.\n"
 "\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
+"Infelizmente estamos com problemas tÃ©cnicos que nos impossibilitam de "
+"processar o seu pedido neste momento. Por favor seja paciente enquanto "
+"tentamos resolver esta situaÃ§Ã£o.\n"
 "\n"
-"    "
-msgstr ""
 
 #~ msgid ""
 #~ "\n"
@@ -422,10 +279,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -444,18 +303,18 @@ msgstr ""
 #~ "desses serviÃ§os.\n"
 #~ "\n"
 #~ "SÃ³ processamos emails de serviÃ§os que suportam \"DKIM\",\n"
-#~ "que Ã© uma forma de verificar que o endereÃ§o do \"Remetente\" Ã© vÃ¡lido e se foi "
-#~ "mesmo esse a enviar o email.\n"
+#~ "que Ã© uma forma de verificar que o endereÃ§o do \"Remetente\" Ã© vÃ¡lido e "
+#~ "se foi mesmo esse a enviar o email.\n"
 #~ "\n"
-#~ "(Pedimos desculpa se nÃ£o solicitou este email. Como a sua mensagem Ã© de um "
-#~ "serviÃ§o que nÃ£o suporta  DKIM, estamos a enviar esta curta explicaÃ§Ã£o, e "
-#~ "depois este endereÃ§o de email serÃ¡ ignorado.)\n"
+#~ "(Pedimos desculpa se nÃ£o solicitou este email. Como a sua mensagem Ã© de "
+#~ "um serviÃ§o que nÃ£o suporta  DKIM, estamos a enviar esta curta explicaÃ§Ã£o, "
+#~ "e depois este endereÃ§o de email serÃ¡ ignorado.)\n"
 #~ "\n"
 #~ "Actualmente nÃ£o suportamos emails com HTML or Base64, pelo que terÃ¡ que "
 #~ "utilizar apenas texto (plain text).\n"
 #~ "\n"
-#~ "Se tiver alguma dÃºvida, pode contactar um humano no seguinte endereÃ§o: tor-"
-#~ "assistants@xxxxxxxxxxxxxx\n"
+#~ "Se tiver alguma dÃºvida, pode contactar um humano no seguinte endereÃ§o: "
+#~ "tor-assistants@xxxxxxxxxxxxxx\n"
 
 # Estou em dÃºvida no Farsi | Adicionei PortuguÃªs. Vou pedir ao administrador para criar o +pt no email.
 #~ msgid ""
@@ -525,8 +384,8 @@ msgstr ""
 #~ "tor-im-browser-bundle\n"
 #~ "source-bundle\n"
 #~ "\n"
-#~ "Por favor responda a esta email (para gettor@xxxxxxxxxxxxxx), e diga qual o "
-#~ "pacote que deseja, colocando o seu nome no corpo do seu email.\n"
+#~ "Por favor responda a esta email (para gettor@xxxxxxxxxxxxxx), e diga qual "
+#~ "o pacote que deseja, colocando o seu nome no corpo do seu email.\n"
 #~ "\n"
 #~ "OBTER VERSÃ?ES TRADUZIDAS DO TOR\n"
 #~ "===================================\n"
@@ -536,8 +395,8 @@ msgstr ""
 #~ "\n"
 #~ "gettor+zh@xxxxxxxxxxxxxx\n"
 #~ "\n"
-#~ "Este exemplo vai enviar o pacote traduzido para ChinÃªs Simplificado. Veja a "
-#~ "lista de endereÃ§os de email existentes que pode utilizar:\n"
+#~ "Este exemplo vai enviar o pacote traduzido para ChinÃªs Simplificado. Veja "
+#~ "a lista de endereÃ§os de email existentes que pode utilizar:\n"
 #~ "\n"
 #~ "Lista de endereÃ§os de email suportados:\n"
 #~ "-------------------------\n"
@@ -593,8 +452,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -613,7 +472,8 @@ msgstr ""
 #~ "Aqui estÃ¡ o software que foi pedido, num arquivo ZIP. Descomprima este "
 #~ "ficheiro e verifique a assinatura.\n"
 #~ "\n"
-#~ "Dica: Se tiver o GnuPG instalado, utilize-o atravÃ©s da linha de comandos:\n"
+#~ "Dica: Se tiver o GnuPG instalado, utilize-o atravÃ©s da linha de "
+#~ "comandos:\n"
 #~ "\n"
 #~ "gpg --verify <nomedopacote>.asc <nomedopacote>\n"
 #~ "\n"
@@ -621,26 +481,26 @@ msgstr ""
 #~ "\n"
 #~ "gpg: Good signature from \"Roger Dingledine <arma@xxxxxxx>\"\n"
 #~ "\n"
-#~ "Se nÃ£o estÃ¡ familiarizado com ferramentas de linha de comandos, procura por "
-#~ "um assistente grÃ¡fico:\n"
+#~ "Se nÃ£o estÃ¡ familiarizado com ferramentas de linha de comandos, procura "
+#~ "por um assistente grÃ¡fico:\n"
 #~ "\n"
 #~ "http://www.gnupg.org/related_software/frontends.html\n";
 #~ "\n"
-#~ "Se a sua ligaÃ§Ã£o de Internet bloqueia acesso Ã  rede Tor, pode ser necessÃ¡rio "
-#~ "utilizar uma Bridge (ponte). Pontos Bridge sÃ£o pontos da rede Tor que nÃ£o "
-#~ "estÃ£o listados no directÃ³rio principal. Como nÃ£o existe uma lista destes "
-#~ "pontos, o seu Prestador de ServiÃ§os (ISP), nÃ£o conseguirÃ¡ bloquear todos os "
-#~ "pontos existentes.\n"
+#~ "Se a sua ligaÃ§Ã£o de Internet bloqueia acesso Ã  rede Tor, pode ser "
+#~ "necessÃ¡rio utilizar uma Bridge (ponte). Pontos Bridge sÃ£o pontos da rede "
+#~ "Tor que nÃ£o estÃ£o listados no directÃ³rio principal. Como nÃ£o existe uma "
+#~ "lista destes pontos, o seu Prestador de ServiÃ§os (ISP), nÃ£o conseguirÃ¡ "
+#~ "bloquear todos os pontos existentes.\n"
 #~ "\n"
-#~ "Pode adquirir endereÃ§os de pontos bridge (ponte) enviando um email com \"get "
-#~ "bridges\" no corpo da sua mensagem para o seguinte endereÃ§o:\n"
+#~ "Pode adquirir endereÃ§os de pontos bridge (ponte) enviando um email com "
+#~ "\"get bridges\" no corpo da sua mensagem para o seguinte endereÃ§o:\n"
 #~ "bridges@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "TambÃ©m Ã© possÃvel obter endereÃ§os de bridges atravÃ©s do seguinte URL: "
 #~ "https://bridges.torproject.org/\n";
 #~ "\n"
-#~ "Se tiver alguma dÃºvida, pode contactar um humano no seguinte endereÃ§o: tor-"
-#~ "assistants@xxxxxxxxxxxxxx\n"
+#~ "Se tiver alguma dÃºvida, pode contactar um humano no seguinte endereÃ§o: "
+#~ "tor-assistants@xxxxxxxxxxxxxx\n"
 #~ "\n"
 
 #~ msgid ""
@@ -680,8 +540,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -701,14 +561,15 @@ msgstr ""
 #~ "ficheiro e verifique a assinatura.\n"
 #~ "\n"
 #~ "NOTA IMPORTANTE:\n"
-#~ "Como este ficheiro Ã© apenas um de um arquivo de vÃ¡rios ficheiros, terÃ¡ que "
-#~ "esperar a recepÃ§Ã£o de todas as partes antes de poder extraÃ-lo, dando um "
-#~ "duplo-click no primeiro ficheiro.\n"
+#~ "Como este ficheiro Ã© apenas um de um arquivo de vÃ¡rios ficheiros, terÃ¡ "
+#~ "que esperar a recepÃ§Ã£o de todas as partes antes de poder extraÃ-lo, dando "
+#~ "um duplo-click no primeiro ficheiro.\n"
 #~ "\n"
-#~ "Os pacotes podem vir com a sua ordem alterada. Verifique que recebeu todas "
-#~ "as partes antes de tentar extrair o arquivo.\n"
+#~ "Os pacotes podem vir com a sua ordem alterada. Verifique que recebeu "
+#~ "todas as partes antes de tentar extrair o arquivo.\n"
 #~ "\n"
-#~ "Dica: Se tiver o GnuPG instalado, utilize-o atravÃ©s da linha de comandos:\n"
+#~ "Dica: Se tiver o GnuPG instalado, utilize-o atravÃ©s da linha de "
+#~ "comandos:\n"
 #~ "\n"
 #~ "gpg --verify <nomedopacote>.asc <nomedopacote>\n"
 #~ "\n"
@@ -716,34 +577,34 @@ msgstr ""
 #~ "\n"
 #~ "gpg: Good signature from \"Roger Dingledine <arma@xxxxxxx>\"\n"
 #~ "\n"
-#~ "Se nÃ£o estÃ¡ familiarizado com ferramentas de linha de comandos, procura por "
-#~ "um assistente grÃ¡fico:\n"
+#~ "Se nÃ£o estÃ¡ familiarizado com ferramentas de linha de comandos, procura "
+#~ "por um assistente grÃ¡fico:\n"
 #~ "\n"
 #~ "http://www.gnupg.org/related_software/frontends.html\n";
 #~ "\n"
-#~ "Se a sua ligaÃ§Ã£o de Internet bloqueia acesso Ã  rede Tor, pode ser necessÃ¡rio "
-#~ "utilizar uma Bridge (ponte). Pontos Bridge sÃ£o pontos da rede Tor que nÃ£o "
-#~ "estÃ£o listados no directÃ³rio principal. Como nÃ£o existe uma lista destes "
-#~ "pontos, o seu Prestador de ServiÃ§os (ISP), nÃ£o conseguirÃ¡ bloquear todos os "
-#~ "pontos existentes.\n"
+#~ "Se a sua ligaÃ§Ã£o de Internet bloqueia acesso Ã  rede Tor, pode ser "
+#~ "necessÃ¡rio utilizar uma Bridge (ponte). Pontos Bridge sÃ£o pontos da rede "
+#~ "Tor que nÃ£o estÃ£o listados no directÃ³rio principal. Como nÃ£o existe uma "
+#~ "lista destes pontos, o seu Prestador de ServiÃ§os (ISP), nÃ£o conseguirÃ¡ "
+#~ "bloquear todos os pontos existentes.\n"
 #~ "\n"
-#~ "Pode adquirir endereÃ§os de pontos bridge (ponte) enviando um email com \"get "
-#~ "bridges\" no corpo da sua mensagem para o seguinte endereÃ§o:\n"
+#~ "Pode adquirir endereÃ§os de pontos bridge (ponte) enviando um email com "
+#~ "\"get bridges\" no corpo da sua mensagem para o seguinte endereÃ§o:\n"
 #~ "bridges@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "TambÃ©m Ã© possÃvel obter endereÃ§os de bridges atravÃ©s do seguinte URL: "
 #~ "https://bridges.torproject.org/\n";
 #~ "\n"
-#~ "Se tiver alguma dÃºvida, pode contactar um humano no seguinte endereÃ§o: tor-"
-#~ "assistants@xxxxxxxxxxxxxx\n"
+#~ "Se tiver alguma dÃºvida, pode contactar um humano no seguinte endereÃ§o: "
+#~ "tor-assistants@xxxxxxxxxxxxxx\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "\n"
 #~ "    Hello, This is the \"GetTor\" robot.\n"
 #~ "\n"
-#~ "    Thank you for your request. It was successfully understood. Your request "
-#~ "is\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"
@@ -765,35 +626,12 @@ msgstr ""
 #~ "Obrigado pelo seu pedido. O mesmo estÃ¡ neste momento a ser processado, e "
 #~ "deverÃ¡ recebÃª-lo dentro de 10 minutos.\n"
 #~ "\n"
-#~ "Se nunca receber o/os pacote/s, pode ser porque o email Ã© demasiado grande e "
-#~ "estÃ¡ a ser bloqueado pelo seu prestador de email.\n"
+#~ "Se nunca receber o/os pacote/s, pode ser porque o email Ã© demasiado "
+#~ "grande e estÃ¡ a ser bloqueado pelo seu prestador de email.\n"
 #~ "Tente enviar o seu email de uma conta gmail.com ou yahoo.cn.\n"
 #~ " Pode, inclusive, pedir pelo pacote tor-browser-bundle em vez do tor-im-"
 #~ "browser-bundle, por ser mais pequeno em tamanho.\n"
 #~ "\n"
-#~ "Se tiver alguma dÃºvida, pode contactar um humano no seguinte endereÃ§o: tor-"
-#~ "assistants@xxxxxxxxxxxxxx\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "    Hello, This is the \"GetTor\" robot.\n"
-#~ "\n"
-#~ "    Thank you for your request.\n"
-#~ "\n"
-#~ "    Unfortunately we are currently experiencing problems and we can't "
-#~ "fulfill\n"
-#~ "    your request right now. Please be patient as we try to resolve this "
-#~ "issue.\n"
-#~ "\n"
-#~ "        "
-#~ msgstr ""
-#~ "\n"
-#~ "OlÃ¡! Este Ã© o robot \"GetTor\".\n"
-#~ "\n"
-#~ "Obrigado pelo seu pedido.\n"
-#~ "\n"
-#~ "Infelizmente estamos com problemas tÃ©cnicos que nos impossibilitam de "
-#~ "processar o seu pedido neste momento. Por favor seja paciente enquanto "
-#~ "tentamos resolver esta situaÃ§Ã£o.\n"
+#~ "Se tiver alguma dÃºvida, pode contactar um humano no seguinte endereÃ§o: "
+#~ "tor-assistants@xxxxxxxxxxxxxx\n"
 #~ "\n"
diff --git a/i18n/pt_BR/gettor.po b/i18n/pt_BR/gettor.po
index 1842f89..f9ec3ca 100644
--- a/i18n/pt_BR/gettor.po
+++ b/i18n/pt_BR/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-08-24 19:48+0200\n"
 "Last-Translator: airton <airton.torres@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "OlÃ¡, Este Ã© o robÃ´ \"GetTor\".\n"
@@ -33,14 +31,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "    Infelizmente, nÃ£o lhe responderemos neste endereÃ§o. Voce deve criar\n"
@@ -49,106 +45,71 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -159,272 +120,159 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:499
-msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 
 #~ msgid ""
@@ -436,10 +284,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -467,10 +317,11 @@ msgstr ""
 #~ "explicaÃ§Ã£o,\n"
 #~ "    e este endereÃ§o de email serÃ¡ ignorado pelos prÃ³ximo dias.)\n"
 #~ "\n"
-#~ "    Ã? importante dizer, tambÃ©m, que nÃ£o aceitamos emails em HTML ou bas64.\n"
+#~ "    Ã? importante dizer, tambÃ©m, que nÃ£o aceitamos emails em HTML ou "
+#~ "bas64.\n"
 #~ "    VocÃª deve nos enviar no formato de texto puro.\n"
 #~ "\n"
-#~ "    Caso vocÃª tenha alguma duvida ou esta operaÃ§Ã£o nÃ£o esteja funcionando, "
-#~ "vocÃª pode contactar\n"
+#~ "    Caso vocÃª tenha alguma duvida ou esta operaÃ§Ã£o nÃ£o esteja "
+#~ "funcionando, vocÃª pode contactar\n"
 #~ "    um humano atravÃ©s desse endereÃ§o: tor-assistants@xxxxxxxxxxxxxx\n"
 #~ "        "
diff --git a/i18n/ro/gettor.po b/i18n/ro/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/ro/gettor.po
+++ b/i18n/ro/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ru/gettor.po b/i18n/ru/gettor.po
index 03c9878..ada697b 100644
--- a/i18n/ru/gettor.po
+++ b/i18n/ru/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-09-06 20:03+0200\n"
 "Last-Translator: vitaliy <vitolink@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,18 +14,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 " Ð?Ð°Ñ? Ð¿Ñ?Ð¸Ð²ÐµÑ?Ñ?Ñ?Ð²Ñ?ÐµÑ? Ñ?Ð¾Ð±Ð¾Ñ?() \"GetTor\"().\n"
@@ -34,14 +32,12 @@ msgstr ""
 "\n"
 " "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 " Ð? Ñ?Ð¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ?, Ð¼Ñ? Ð½Ðµ ()Ð¼Ð¾Ð¶ÐµÐ¼ Ð¾Ñ?Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð²Ð°Ð¼ Ð½Ð° Ñ?Ñ?Ð¾Ñ? Ð°Ð´Ñ?ÐµÑ?. Ð?Ð°Ð¼ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾() "
@@ -51,30 +47,27 @@ msgstr ""
 "\n"
 " "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
-"    Ð?Ñ? Ð¼Ð¾Ð¶ÐµÐ¼ Ð¾Ð±Ñ?Ð°Ð±Ð°Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð² Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ñ? \"DKIM\",\n"
+"    Ð?Ñ? Ð¼Ð¾Ð¶ÐµÐ¼ Ð¾Ð±Ñ?Ð°Ð±Ð°Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð² Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ñ? \"DKIM"
+"\",\n"
 "    Ñ?Ñ?Ð¾ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?Ñ?, Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?Ñ?Ñ?Ð°Ñ? Ð½Ð°Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ?, Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾\n"
 "    Ð»Ð¸ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°, Ñ?ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð² Ñ?Ñ?Ñ?Ð¾ÐºÐµ \"From\", Ð±Ñ?Ð» Ð²Ñ?Ñ?Ð»Ð°Ð½ Ð·Ð°Ð¿Ñ?Ð¾Ñ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "    (Ð?Ñ? Ð¿Ñ?Ð¾Ñ?Ð¸Ð¼ Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð¸Ñ?, ÐµÑ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ð²Ñ?Ñ?Ñ?Ð»Ð°Ð»Ð¸ Ñ?Ñ?Ð¾Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?. Ð¢Ð°Ðº ÐºÐ°Ðº Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?\n"
@@ -84,13 +77,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "    Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¾Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ð° Ñ?Ð¾Ñ? Ñ?Ð°ÐºÑ?, Ñ?Ñ?Ð¾ Ð² Ð½Ð°Ñ?Ñ?Ð¾Ñ?Ñ?ÐµÐµ\n"
@@ -99,13 +90,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "    Ð?Ñ?Ð»Ð¸ Ñ? Ð²Ð°Ñ? Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ Ð²Ð¾Ð¿Ñ?Ð¾Ñ?Ñ? Ð¸Ð»Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð° Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð°ÐµÑ?,\n"
@@ -114,13 +103,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "    Ð¯ Ð²Ñ?Ñ?Ð»Ñ? Ð²Ð°Ð¼ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¾Ñ?Ð½Ñ?Ð¹ Ð¿Ð°ÐºÐµÑ? Tor, ÐµÑ?Ð»Ð¸ Ð²Ñ? Ñ?Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ðµ Ð¼Ð½Ðµ ÐºÐ°ÐºÐ¾Ð¹ Ð¸Ð· Ð½Ð¸Ñ? "
@@ -130,13 +117,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ñ?Ñ?Ðµ Ð¿Ð¸Ñ?Ñ?Ð¼Ð¾ Ð½Ð° Ð°Ð´Ñ?ÐµÑ? gettor@xxxxxxxxxxxxxx, Ñ?ÐºÐ°Ð·Ð°Ð²\n"
@@ -144,23 +129,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "    Ð?Ð?Ð?Ð£Ð§Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð«Ð¥ Ð?Ð?Ð Ð¡Ð?Ð? TOR\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "    Ð§Ñ?Ð¾Ð±Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸Ñ? Tor, Ð¿ÐµÑ?ÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ?Ñ? Ð° Ð²Ð°Ñ? Ñ?Ð·Ñ?Ðº, Ñ?ÐºÐ°Ð¶Ð¸Ñ?Ðµ\n"
@@ -168,14 +149,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "    Ð? Ð¿Ñ?Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ð¾Ð¼ Ð½Ð¸Ð¶Ðµ Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ðµ Ð·Ð°Ð¿Ñ?Ð°Ñ?Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ð»Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ñ?\n"
@@ -183,31 +162,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "    Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ?Ñ? Ñ?Ð·Ñ?ÐºÐ¾Ð²:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "    Ð?Ð¾Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð²Ñ?ÐµÑ? Ð¸Ð¼ÐµÑ?Ñ?Ð¸Ñ?Ñ?Ñ? Ñ?Ð·Ñ?ÐºÐ¾Ð²Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸Ð¹:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -218,9 +192,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Ð?Ñ?Ð°Ð±Ñ?ÐºÐ¸Ð¹\n"
@@ -237,37 +209,30 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "    Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ð²Ð¸Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð·Ñ?Ðº, Ñ?Ð¾ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð°Ð½Ð³Ð»Ð¸Ð¹Ñ?ÐºÑ?Ñ? Ð²ÐµÑ?Ñ?Ð¸Ñ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "    Ð?Ð?Ð?Ð?Ð¢Ð« Ð?Ð?Ð?Ð?Ð?Ð? Ð Ð?Ð?Ð?Ð?Ð Ð?\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "    Ð?Ñ?Ð»Ð¸ Ð²Ð°Ñ?Ðµ Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð°ÐµÑ? Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ð¾ Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? \n"
@@ -277,37 +242,32 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "    Ð?Ñ?Ð¾Ñ?Ñ?Ð¾ Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ?Ðµ Ñ?Ð»Ð¾Ð²Ð¾ 'split' Ð³Ð´Ðµ-Ð½Ð¸Ð±Ñ?Ð´Ñ? Ð² Ð¿Ð¸Ñ?Ñ?Ð¼Ðµ, Ð½Ð°Ð¿Ñ?Ð¸Ð¼ÐµÑ? Ñ?Ð°Ðº:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "    Ð?Ð¾Ñ?Ñ?Ð»Ð°Ñ? Ñ?Ñ?Ð¾Ñ? Ñ?ÐµÐºÑ?Ñ? Ð² Ð¿Ð¸Ñ?Ñ?Ð¼Ðµ Ð½Ð° GetTor Ð²Ñ? Ð·Ð°Ð¿Ñ?Ð°Ñ?Ð¸Ð²Ð°ÐµÑ?Ðµ \n"
-"    Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ?Ð° Tor Browser Bundle Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¸Ð¼Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?Ð¼Ð¸ (Ð¿Ð¾ 1,4Ð?Ð±).\n"
+"    Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ?Ð° Tor Browser Bundle Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¸Ð¼Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?Ð¼Ð¸ (Ð¿Ð¾ "
+"1,4Ð?Ð±).\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "    Ð?Ð¾Ñ?Ð»Ðµ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð²Ñ?ÐµÑ? Ñ?Ð°Ñ?Ñ?ÐµÐ¹, Ð²Ð°Ð¼ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ñ?Ð¾Ð±Ñ?Ð°Ñ?Ñ? Ð¸Ñ? Ð² \n"
@@ -315,72 +275,47 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "    1.) Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð²Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð½Ñ?Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ? Ð² Ð¾Ð´Ð½Ñ? Ð¿Ð°Ð¿ÐºÑ? Ð½Ð° Ð´Ð¸Ñ?ÐºÐµ.\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"    2.) Ð Ð°Ð·Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?, Ð·Ð°ÐºÐ°Ð½Ñ?Ð¸Ð²Ð°Ñ?Ñ?Ð¸ÐµÑ?Ñ? Ð½Ð° \".z\". Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸ "
-"Ð²Ñ?Ðµ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ? \n"
+"    2.) Ð Ð°Ð·Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?, Ð·Ð°ÐºÐ°Ð½Ñ?Ð¸Ð²Ð°Ñ?Ñ?Ð¸ÐµÑ?Ñ? Ð½Ð° \".z\". Ð?Ñ?Ð»Ð¸ Ð²Ñ? "
+"Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸ Ð²Ñ?Ðµ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ? \n"
 "        Ð² Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ?Ñ?Ð¾ Ñ?Ð¾Ð·Ð´Ð°Ð½Ð½Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?, Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾ Ñ?Ð°Ñ?Ð¿Ð°ÐºÑ?Ð¹Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ? Ð² Ð½ÐµÑ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"    3.) Ð?Ð°Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð¾ÐºÐ¾Ð½Ñ?Ð°Ð½Ð¸Ðµ Ñ? Ñ?Ð°Ð¹Ð»Ð°, Ð·Ð°ÐºÐ°Ð½Ñ?Ð¸Ð²Ð°Ñ?Ñ?ÐµÐ³Ð¾Ñ?Ñ? Ð½Ð° \".ex_RENAME\" Ð½Ð° "
-"\".exe\", Ð° \n"
-"        Ñ?Ð°Ð¹Ð» Ð·Ð°ÐºÐ°Ð½Ñ?Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ð¹Ñ?Ñ? Ð½Ð° \".ex_RENAME.asc\" Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð·Ð°ÐºÐ°Ð½Ñ?Ð¸Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ð½Ð° \n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
-"    4.) Ð?ÐµÑ?Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?, ÐºÐ°Ðº Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾ Ð² Ð²Ñ?Ñ?Ð»Ð°Ð½Ð½Ð¾Ð¼ Ð²Ð°Ð¼ Ñ?Ð°Ð½ÐµÐµ Ñ? ÐºÐ°Ð¶Ð´Ñ?Ð¼ \n"
+"    4.) Ð?ÐµÑ?Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?, ÐºÐ°Ðº Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾ Ð² Ð²Ñ?Ñ?Ð»Ð°Ð½Ð½Ð¾Ð¼ Ð²Ð°Ð¼ Ñ?Ð°Ð½ÐµÐµ Ñ? "
+"ÐºÐ°Ð¶Ð´Ñ?Ð¼ \n"
 "        Ð¿Ð°ÐºÐµÑ?Ð¾Ð¼ Ð¿Ð¸Ñ?Ñ?Ð¼Ðµ. (gpg --verify)\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "    5.) Ð¢ÐµÐ¿ÐµÑ?Ñ? Ð²Ð¾Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ð¹Ñ?ÐµÑ?Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð¾Ð¹, ÐºÐ¾Ñ?Ð¾Ñ?Ð°Ñ? Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð°Ñ?Ð¿Ð°ÐºÐ¾Ð²Ñ?Ð²Ð°Ñ?Ñ? "
@@ -391,64 +326,48 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "        Ð Ð°Ñ?Ð¿Ð°ÐºÐ¾Ð²Ð°Ñ?Ñ? Ð¿Ð°ÐºÐµÑ? Tor Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð²Ð¾Ð¹Ð½Ñ?Ð¼ ÐºÐ»Ð¸ÐºÐ¾Ð¼ Ð½Ð° Ñ?Ð°Ð¹Ð»Ðµ \".exe\".\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "    6.) Ð?Ð¾Ñ?Ð»Ðµ Ñ?Ð¾Ð³Ð¾, ÐºÐ°Ðº Ñ?Ð°Ñ?Ð¿Ð°ÐºÐ¾Ð²ÐºÐ° Ð·Ð°ÐºÐ¾Ð½Ñ?ÐµÐ½Ð°, Ð²Ð°Ð¼ Ð½Ñ?Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ?Ð¸ \n"
-"        Ñ?Ð¾Ð·Ð´Ð°Ð½Ð½Ñ?Ð¹ \".exe\" Ñ?Ð°Ð¹Ð» Ð² Ñ?ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð´Ð»Ñ? Ñ?Ð°Ñ?Ð¿Ð°ÐºÐ¾Ð²ÐºÐ¸ Ð¿Ð°Ð¿ÐºÐµ. Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° "
-"Ð½ÐµÐ¼\n"
+"        Ñ?Ð¾Ð·Ð´Ð°Ð½Ð½Ñ?Ð¹ \".exe\" Ñ?Ð°Ð¹Ð» Ð² Ñ?ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð´Ð»Ñ? Ñ?Ð°Ñ?Ð¿Ð°ÐºÐ¾Ð²ÐºÐ¸ Ð¿Ð°Ð¿ÐºÐµ. Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ "
+"Ð½Ð° Ð½ÐµÐ¼\n"
 "        Ð´Ð²Ð°Ð¶Ð´Ñ?, Ñ?Ñ?Ð¾Ð±Ñ? Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tor Browser Bundle.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "    7.) ÐÑ?Ð¾ Ð²Ñ?Ðµ. Ð?Ñ? Ð·Ð°ÐºÐ¾Ð½Ñ?Ð¸Ð»Ð¸. Ð¡Ð¿Ð°Ñ?Ð¸Ð±Ð¾ Ð·Ð° Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ Tor Ð¸ Ñ?Ð´Ð°Ñ?Ð¸!\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"    Ð?Ð?Ð?Ð?Ð?Ð Ð?Ð?Ð?\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "    Ð?Ð¾Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ð¾Ðµ Ð²Ð°Ð¼Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?ÐµÐ½Ð¸Ðµ Ð² Ð²Ð¸Ð´Ðµ zip Ñ?Ð°Ð¹Ð»Ð°. "
@@ -457,13 +376,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "    Ð?Ð¾Ð´Ñ?ÐºÐ°Ð·ÐºÐ°: Ð?Ñ?Ð»Ð¸ Ð½Ð° Ð²Ð°Ñ?ÐµÐ¼ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð° GnuPG, Ð¿Ð¾Ñ?Ð»Ðµ\n"
@@ -472,37 +389,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "    Ð ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ? Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ?Ñ?Ñ? Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ð½Ð¾ Ñ?Ð°ÐºÐ¸Ð¼:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "    Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ñ?Ð¼ÐµÐµÑ?Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ Ñ?Ñ?Ñ?Ð¾ÐºÐ¾Ð¹, Ð½Ð°Ð¹Ð´Ð¸Ñ?Ðµ \n"
@@ -510,17 +410,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    Ð?Ñ?Ð»Ð¸ Ð²Ð°Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ðº Ñ?ÐµÑ?Ð¸ Tor Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½, Ð²Ð°Ð¼ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸Ñ?Ñ?Ñ?Ñ?\n"
@@ -536,15 +434,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "    Ð?Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ?, Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ð² Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ, Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð°Ñ?ÐµÐµ \"get bridges\"\n"
@@ -553,14 +447,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "    Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ? Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð°, Ð²Ð¾Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð²Ñ?Ð¸Ñ?Ñ? Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?ÐµÐ¹ "
@@ -569,16 +460,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "    Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð§Ð?Ð?Ð?Ð?:\n"
@@ -590,13 +479,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "    Ð?Ð°ÐºÐµÑ?Ñ? Ð¼Ð¾Ð³Ñ?Ñ? Ð¿Ñ?Ð¸Ñ?Ð¾Ð´Ð¸Ñ?Ñ? Ð½Ðµ Ð¿Ð¾ Ð¿Ð¾Ñ?Ñ?Ð´ÐºÑ?! Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ñ?Ð±ÐµÐ´Ð¸Ñ?ÐµÑ?Ñ?, Ñ?Ñ?Ð¾ Ð²Ñ? "
@@ -605,16 +492,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Ð¡Ð¿Ð°Ñ?Ð¸Ð±Ð¾ Ð·Ð° Ð²Ð°Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?. Ð?Ñ? ÐµÐ³Ð¾ Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¿Ñ?Ð¸Ð½Ñ?Ð»Ð¸. Ð? Ð½Ð°Ñ?Ñ?Ð¾Ñ?Ñ?ÐµÐµ Ð²Ñ?ÐµÐ¼Ñ?\n"
@@ -624,43 +507,73 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
-"    Ð?Ñ?Ð»Ð¸ Ð²Ñ? ÐµÐ³Ð¾ Ñ?Ð°Ðº Ð¸ Ð½Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ð»Ð¸, Ð¿Ð°ÐºÐµÑ?, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ñ?Ð»Ð¸Ñ?ÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸Ðº Ð´Ð»Ñ? Ð²Ð°Ñ?ÐµÐ³Ð¾\n"
-"    Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°. Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ? Ñ?Ñ?ÐµÑ?Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ð½Ð° "
-"gmail.com \n"
+"    Ð?Ñ?Ð»Ð¸ Ð²Ñ? ÐµÐ³Ð¾ Ñ?Ð°Ðº Ð¸ Ð½Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ð»Ð¸, Ð¿Ð°ÐºÐµÑ?, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ñ?Ð»Ð¸Ñ?ÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸Ðº Ð´Ð»Ñ? "
+"Ð²Ð°Ñ?ÐµÐ³Ð¾\n"
+"    Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°. Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ? Ñ?Ñ?ÐµÑ?Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ð½Ð° gmail."
+"com \n"
 "    Ð¸Ð»Ð¸ yahoo.cn. Ð¢Ð°ÐºÐ¶Ðµ Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¿Ð°ÐºÐµÑ? tor-browser-bundle Ð²Ð¼ÐµÑ?Ñ?Ð¾ "
 "tor-im-browser-bundle,\n"
 "    Ñ?Ð°Ðº ÐºÐ°Ðº Ð¾Ð½ Ð¼ÐµÐ½Ñ?Ñ?Ðµ Ð¿Ð¾ Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
-"    Ð? Ñ?Ð¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ?, Ð¼Ñ? Ñ?Ñ?Ð¾Ð»ÐºÐ½Ñ?Ð»Ð¸Ñ?Ñ? Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð°Ð¼Ð¸ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼ Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð²Ð°Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?\n"
+"    Ð? Ñ?Ð¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ?, Ð¼Ñ? Ñ?Ñ?Ð¾Ð»ÐºÐ½Ñ?Ð»Ð¸Ñ?Ñ? Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð°Ð¼Ð¸ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼ Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð²Ð°Ñ? "
+"Ð·Ð°Ð¿Ñ?Ð¾Ñ?\n"
 "    Ð¿Ñ?Ñ?Ð¼Ð¾ Ñ?ÐµÐ¹Ñ?Ð°Ñ?. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¿Ð¾Ñ?ÐµÑ?Ð¿Ð¸Ñ?Ðµ, Ð¼Ñ? Ñ?Ð°Ð±Ð¾Ñ?Ð°ÐµÐ¼ Ð½Ð°Ð´ Ñ?ÐµÑ?ÐµÐ½Ð¸ÐµÐ¼ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ?.\n"
 "\n"
 "    "
 
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    3.) Ð?Ð°Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð¾ÐºÐ¾Ð½Ñ?Ð°Ð½Ð¸Ðµ Ñ? Ñ?Ð°Ð¹Ð»Ð°, Ð·Ð°ÐºÐ°Ð½Ñ?Ð¸Ð²Ð°Ñ?Ñ?ÐµÐ³Ð¾Ñ?Ñ? Ð½Ð° \".ex_RENAME\" Ð½Ð° "
+#~ "\".exe\", Ð° \n"
+#~ "        Ñ?Ð°Ð¹Ð» Ð·Ð°ÐºÐ°Ð½Ñ?Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ð¹Ñ?Ñ? Ð½Ð° \".ex_RENAME.asc\" Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð·Ð°ÐºÐ°Ð½Ñ?Ð¸Ð²Ð°Ñ?Ñ?Ñ?Ñ? "
+#~ "Ð½Ð° \n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Ð?Ð?Ð?Ð?Ð?Ð Ð?Ð?Ð?\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+
 # kd
 #, fuzzy
 #~ msgid ""
@@ -672,10 +585,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -693,7 +608,8 @@ msgstr ""
 #~ "   Ñ?Ñ?ÐµÑ? Ð² GMAIL.COM Ð¸Ð»Ð¸ Ð² YAHOO.COM Ð¸ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ð¸Ð· \n"
 #~ "    Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· Ñ?Ñ?Ð¸Ñ? Ñ?Ñ?ÐµÑ?Ð¾Ð².\n"
 #~ "\n"
-#~ "Ð?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¾Ð±Ñ?Ð°Ð±Ð°Ñ?Ñ?Ð²Ð°ÐµÐ¼ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ñ? Ð¸Ð· Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ñ? Ñ?Ð»Ñ?Ð¶Ð± Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ñ? \"DKIM\",\n"
+#~ "Ð?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¾Ð±Ñ?Ð°Ð±Ð°Ñ?Ñ?Ð²Ð°ÐµÐ¼ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ñ? Ð¸Ð· Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ñ? Ñ?Ð»Ñ?Ð¶Ð± Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ñ? \"DKIM"
+#~ "\",\n"
 #~ "ÐºÐ¾Ñ?Ð¾Ñ?Ð°Ñ? Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ñ?Ñ?Ð½ÐºÑ?Ð¸ÐµÐ¹ Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?Ñ?, Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?Ñ?Ñ?Ð°Ñ? Ð½Ð°Ð¼ Ñ?Ð±ÐµÐ´Ð¸Ñ?Ñ?Ñ?Ñ? Ð² "
 #~ "Ñ?Ð¾Ð¼, Ñ?Ñ?Ð¾ Ð°Ð´Ñ?ÐµÑ? Ð²\n"
 #~ "Ñ?Ñ?Ñ?Ð¾ÐºÐµ \"Ð?Ñ?\" Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾ Ð¾Ñ? Ñ?Ð¾Ð³Ð¾, ÐºÑ?Ð¾ Ð¾Ñ?Ð¾Ñ?Ð»Ð°Ð» Ð¿Ð¾Ñ?Ñ?Ñ?.\n"
@@ -780,15 +696,16 @@ msgstr ""
 #~ "tor-im-browser-bundle\n"
 #~ "source-bundle\n"
 #~ "\n"
-#~ "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° Ñ?Ð²Ñ?Ð¶Ð¸Ñ?ÐµÑ?Ñ? Ñ? Ð½Ð°Ð¼Ð¸ Ð¿Ð¾ Ñ?Ñ?Ð¾Ð¹ Ñ?Ð»ÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?Ðµ "
-#~ "(gettor@xxxxxxxxxxxxxx), Ð¸ Ñ?ÐºÐ°Ð¶Ð¸Ñ?Ðµ\n"
+#~ "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° Ñ?Ð²Ñ?Ð¶Ð¸Ñ?ÐµÑ?Ñ? Ñ? Ð½Ð°Ð¼Ð¸ Ð¿Ð¾ Ñ?Ñ?Ð¾Ð¹ Ñ?Ð»ÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?Ðµ (gettor@torproject."
+#~ "org), Ð¸ Ñ?ÐºÐ°Ð¶Ð¸Ñ?Ðµ\n"
 #~ "Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· Ð¿Ð°ÐºÐµÑ?Ð¾Ð² Ð² Ð»Ñ?Ð±Ð¾Ð¼ Ð¼ÐµÑ?Ñ?Ðµ Ð² \"Ñ?ÐµÐ»Ðµ\" Ð²Ð°Ñ?ÐµÐ³Ð¾ Ð¿Ð¸Ñ?Ñ?Ð¼Ð°.\n"
 #~ "\n"
 #~ "Ð?Ð?Ð?Ð£Ð§Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð«Ð¥ Ð?Ð?Ð Ð¡Ð?Ð? TOR\n"
 #~ "===================================\n"
 #~ "\n"
 #~ "Ð§Ñ?Ð¾Ð±Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸Ñ? Tor Ð¿ÐµÑ?ÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ?Ñ? Ð½Ð° Ð²Ð°Ñ? Ñ?Ð·Ñ?Ðº,Ñ?ÐºÐ°Ð¶Ð¸Ñ?Ðµ\n"
-#~ "Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ñ?Ð¸Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ð·Ñ?Ðº Ð² Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ Ñ?Ñ?Ñ?Ð¾ÐºÐµ ÐºÑ?Ð´Ð° Ð²Ñ? Ð¾Ñ?Ð¾Ñ?Ð»Ð°Ð»Ð¸ Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?:\n"
+#~ "Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ñ?Ð¸Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ð·Ñ?Ðº Ð² Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ Ñ?Ñ?Ñ?Ð¾ÐºÐµ ÐºÑ?Ð´Ð° Ð²Ñ? Ð¾Ñ?Ð¾Ñ?Ð»Ð°Ð»Ð¸ Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ñ? "
+#~ "Ð¿Ð¾Ñ?Ñ?Ñ?:\n"
 #~ "\n"
 #~ "     gettor+zh@xxxxxxxxxxxxxx\n"
 #~ "\n"
@@ -852,8 +769,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -869,8 +786,8 @@ msgstr ""
 #~ "\n"
 #~ "Ð?Ð´Ñ?Ð°Ð²Ñ?Ñ?Ð²Ñ?Ð¹Ñ?Ðµ! ÐÑ?Ð¾ \"Ñ?Ð¾Ð±Ð¾Ñ? GetTor\"\n"
 #~ "\n"
-#~ "Ð?Ð¾Ñ? Ð²Ð¾Ñ?Ñ?Ñ?ÐµÐ±Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð²Ð°Ð¼Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?ÐµÐ½Ð¸Ðµ Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð² Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ðµ zip. "
-#~ "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° Ñ?Ð°Ð·Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ\n"
+#~ "Ð?Ð¾Ñ? Ð²Ð¾Ñ?Ñ?Ñ?ÐµÐ±Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð²Ð°Ð¼Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?ÐµÐ½Ð¸Ðµ Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð² Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ðµ "
+#~ "zip. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° Ñ?Ð°Ð·Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ\n"
 #~ "Ð¿Ð°ÐºÐµÑ? Ð¸ Ð¿Ð¾Ð´Ñ?Ð²ÐµÑ?Ð´Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ?.\n"
 #~ "\n"
 #~ "Ð?Ð¾Ð´Ñ?ÐºÐ°Ð·ÐºÐ°: Ð?Ñ?Ð»Ð¸ Ð½Ð° Ð²Ð°Ñ?ÐµÐ¼ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ GnuPG, Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ð¹Ñ?Ðµ gpg\n"
@@ -883,8 +800,8 @@ msgstr ""
 #~ "\n"
 #~ "gpg: Good signature from \"Roger Dingledine <arma@xxxxxxx>\"\n"
 #~ "\n"
-#~ "Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ð·Ð½Ð°ÐºÐ¾Ð¼Ñ? Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð°Ð¼Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ Ñ?Ñ?Ñ?Ð¾ÐºÐ¸, Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð¹Ñ?ÐµÑ?Ñ? "
-#~ "Ð½Ð°Ð¹Ñ?Ð¸\\Ð³Ñ?Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ð¹ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¸Ð¹ Ð¸Ð½Ñ?ÐµÑ?Ñ?ÐµÐ¹Ñ? Ð´Ð»Ñ? GnuPG Ð½Ð° Ñ?Ñ?Ð¾Ð¼ Ñ?Ð°Ð¹Ñ?Ðµ:\n"
+#~ "Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ð·Ð½Ð°ÐºÐ¾Ð¼Ñ? Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð°Ð¼Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ Ñ?Ñ?Ñ?Ð¾ÐºÐ¸, Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð¹Ñ?ÐµÑ?Ñ? Ð½Ð°Ð¹Ñ?Ð¸"
+#~ "\\Ð³Ñ?Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ð¹ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¸Ð¹ Ð¸Ð½Ñ?ÐµÑ?Ñ?ÐµÐ¹Ñ? Ð´Ð»Ñ? GnuPG Ð½Ð° Ñ?Ñ?Ð¾Ð¼ Ñ?Ð°Ð¹Ñ?Ðµ:\n"
 #~ "\n"
 #~ "http://www.gnupg.org/related_software/frontends.html\n";
 #~ "\n"
@@ -931,8 +848,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -948,12 +865,12 @@ msgstr ""
 #~ "\n"
 #~ "Ð?Ð´Ñ?Ð°Ð²Ñ?Ñ?Ð²Ñ?Ð¹Ñ?Ðµ! ÐÑ?Ð¾ \"Ñ?Ð¾Ð±Ð¾Ñ? GetTor\".\n"
 #~ "\n"
-#~ "Ð?Ð¾Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ñ?Ð¹ Ð²Ð°Ð¼Ð¸ Ð¿Ð°ÐºÐµÐ¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?ÐµÐ½Ð¸Ñ? ÐºÐ°Ðº Zip Ñ?Ð°Ð¹Ð». Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° "
-#~ "Ñ?Ð°Ð·Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð¿Ð°ÐºÐµÑ? Ð¸ Ð¿Ð¾Ð´Ð²ÐµÑ?Ð´Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ?.\n"
+#~ "Ð?Ð¾Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ñ?Ð¹ Ð²Ð°Ð¼Ð¸ Ð¿Ð°ÐºÐµÐ¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?ÐµÐ½Ð¸Ñ? ÐºÐ°Ðº Zip Ñ?Ð°Ð¹Ð». "
+#~ "Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° Ñ?Ð°Ð·Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ñ?Ð¹Ñ?Ðµ Ð¿Ð°ÐºÐµÑ? Ð¸ Ð¿Ð¾Ð´Ð²ÐµÑ?Ð´Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ?.\n"
 #~ "\n"
 #~ "Ð?Ð?Ð?Ð?Ð?Ð? Ð¡Ð?Ð?Ð?Ð©Ð?Ð?Ð?Ð?:\n"
-#~ "Ð¢Ð°Ðº ÐºÐ°Ðº Ñ?Ñ?Ð¾ Ñ?Ð°Ñ?Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð° Ñ?Ð¿Ð»Ð¸Ñ?-Ñ?Ð°Ð¹Ð», Ð²Ð°Ð¼ Ð½Ñ?Ð¶Ð½Ð¾ Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð°Ñ?Ñ? Ð¿Ð¾ÐºÐ° Ð²Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ "
-#~ "Ð²Ñ?Ðµ Ñ?Ð¿Ð»Ð¸Ñ?-Ñ?Ð°Ð¹Ð» Ð¿ÐµÑ?ÐµÐ´ Ñ?ÐµÐ¼ ÐºÐ°Ðº Ð²Ñ? Ñ?Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ñ? Ð²Ñ?Ðµ\n"
+#~ "Ð¢Ð°Ðº ÐºÐ°Ðº Ñ?Ñ?Ð¾ Ñ?Ð°Ñ?Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð° Ñ?Ð¿Ð»Ð¸Ñ?-Ñ?Ð°Ð¹Ð», Ð²Ð°Ð¼ Ð½Ñ?Ð¶Ð½Ð¾ Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð°Ñ?Ñ? Ð¿Ð¾ÐºÐ° Ð²Ñ? "
+#~ "Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð²Ñ?Ðµ Ñ?Ð¿Ð»Ð¸Ñ?-Ñ?Ð°Ð¹Ð» Ð¿ÐµÑ?ÐµÐ´ Ñ?ÐµÐ¼ ÐºÐ°Ðº Ð²Ñ? Ñ?Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ñ? Ð²Ñ?Ðµ\n"
 #~ "Ð² Ð¾Ð´Ð½Ð¾Ð¹ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ð¸ Ð¸ Ñ?Ð°Ð·Ð°Ñ?Ñ?Ð¸Ð²Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð²Ñ?Ðµ Ñ?ÐµÐ»ÐºÐ½Ñ?Ð² Ð´Ð²Ð°Ð¶Ð´Ñ? Ð½Ð°\n"
 #~ "Ð¿ÐµÑ?Ð²Ñ?Ð¹ Ñ?Ð°Ð¹Ð».\n"
 #~ "\n"
@@ -1001,8 +918,8 @@ msgstr ""
 #~ "\n"
 #~ "    Hello, This is the \"GetTor\" robot.\n"
 #~ "\n"
-#~ "    Thank you for your request. It was successfully understood. Your request "
-#~ "is\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"
@@ -1027,8 +944,10 @@ msgstr ""
 #~ "\n"
 #~ "Ð?Ñ?Ð»Ð¸ Ð¾Ð½ Ð½Ðµ Ð¿Ñ?Ð¸Ð±Ñ?Ð´ÐµÑ?, Ð²Ð¾Ð¶Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð°ÐºÐµÑ? Ñ?Ð»Ð¸Ñ?ÐºÐ¾Ð¼ Ð±Ð¾Ð»Ñ?Ñ?Ð¾Ð¹ Ð´Ð»Ñ? Ð²Ð°Ñ?ÐµÐ³Ð¾ Ð¼ÐµÐ¹Ð» "
 #~ "Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ?Ð°.\n"
-#~ "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð°Ð½Ð¾Ð²Ð¾ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ð¸Ð· gmail.com Ð¸Ð»Ð¸ yahoo.cn Ð°ÐºÐºÐ°Ñ?Ð½Ñ?Ð°. Ð¢Ð°ÐºÐ¶Ðµ\n"
-#~ "Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? tor-browser-bundle Ð½ÐµÐ¶ÐµÐ»Ð¸ Ñ?ÐµÐ¼ tor-im-browser-bundle,\n"
+#~ "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð°Ð½Ð¾Ð²Ð¾ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ð¸Ð· gmail.com Ð¸Ð»Ð¸ yahoo.cn Ð°ÐºÐºÐ°Ñ?Ð½Ñ?Ð°. "
+#~ "Ð¢Ð°ÐºÐ¶Ðµ\n"
+#~ "Ð¿Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? tor-browser-bundle Ð½ÐµÐ¶ÐµÐ»Ð¸ Ñ?ÐµÐ¼ tor-im-browser-"
+#~ "bundle,\n"
 #~ "Ñ?Ð°Ðº ÐºÐ°Ðº Ð¾Ð½ Ð¼ÐµÐ½Ñ?Ñ?ÐµÐ³Ð¾ Ñ?Ð°Ð·Ð¼ÐµÑ?Ð°.\n"
 #~ "\n"
 #~ "Ð?Ñ?Ð»Ð¸ Ñ? Ð²Ð°Ñ? Ð²Ð¾Ð¿Ñ?Ð¾Ñ?Ñ? Ð¸Ð»Ð¸ Ñ?Ñ?Ð¾ Ñ?Ð¾ Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð»Ð¾, Ð²Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ð²Ñ?Ð·Ð°Ñ?Ñ?Ñ?Ñ? \n"
@@ -1055,7 +974,8 @@ msgstr ""
 #~ "\n"
 #~ "Ð¡Ð¿Ð°Ñ?Ð¸Ð±Ð¾ Ð·Ð° Ð²Ð°Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?.\n"
 #~ "\n"
-#~ "Ð? Ñ?Ð¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ? Ñ? Ð½Ð°Ñ? Ñ?ÐµÐ¹Ñ?Ð°Ñ? Ñ?ÐµÑ?Ð½Ð¸Ñ?ÐµÑ?ÐºÐ¸Ðµ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´ÐºÐ¸ Ð¸ Ð¼Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼ Ñ?Ð´Ð¾Ð²Ð»ÐµÑ?Ð²Ð¾Ñ?Ð¸Ñ?Ñ?\n"
-#~ "Ð²Ð°Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð² Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ?. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ?Ðµ, Ð¿Ð¾ÐºÐ° Ð¼Ñ? Ð¿Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? "
-#~ "Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ?.\n"
+#~ "Ð? Ñ?Ð¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ? Ñ? Ð½Ð°Ñ? Ñ?ÐµÐ¹Ñ?Ð°Ñ? Ñ?ÐµÑ?Ð½Ð¸Ñ?ÐµÑ?ÐºÐ¸Ðµ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´ÐºÐ¸ Ð¸ Ð¼Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼ "
+#~ "Ñ?Ð´Ð¾Ð²Ð»ÐµÑ?Ð²Ð¾Ñ?Ð¸Ñ?Ñ?\n"
+#~ "Ð²Ð°Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð² Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ?. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ?Ðµ, Ð¿Ð¾ÐºÐ° Ð¼Ñ? Ð¿Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ñ? "
+#~ "Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ?.\n"
 #~ "\n"
diff --git a/i18n/sco/gettor.po b/i18n/sco/gettor.po
index e7e6736..a711308 100644
--- a/i18n/sco/gettor.po
+++ b/i18n/sco/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/sk/gettor.po b/i18n/sk/gettor.po
index e7e6736..a711308 100644
--- a/i18n/sk/gettor.po
+++ b/i18n/sk/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/sl/gettor.po b/i18n/sl/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/sl/gettor.po
+++ b/i18n/sl/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/so/gettor.po b/i18n/so/gettor.po
index e7e6736..a711308 100644
--- a/i18n/so/gettor.po
+++ b/i18n/so/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/son/gettor.po b/i18n/son/gettor.po
index e7e6736..a711308 100644
--- a/i18n/son/gettor.po
+++ b/i18n/son/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/sq/gettor.po b/i18n/sq/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/sq/gettor.po
+++ b/i18n/sq/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/sr/gettor.po b/i18n/sr/gettor.po
index c3875ae..436d547 100644
--- a/i18n/sr/gettor.po
+++ b/i18n/sr/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-06-20 16:18-0600\n"
 "Last-Translator: George Bush <theranchcowboy@xxxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Ð?Ð´Ñ?Ð°Ð²Ð¾, Ð¾Ð²Ð´Ðµ â??GetTorâ?? Ñ?Ð¾Ð±Ð¾Ñ?.\n"
@@ -31,14 +30,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "Ð?Ð°Ð¶Ð°Ð»Ð¾Ñ?Ñ?, Ð½ÐµÑ?ÐµÐ¼Ð¾ Ð?Ð°Ð¼ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð½Ð° Ð¾Ð²Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?. Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ\n"
@@ -46,14 +43,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "Ð?Ð·Ð»Ð°Ð·Ð¸Ð¼Ð¾ Ñ? Ñ?Ñ?Ñ?Ñ?ÐµÑ? Ñ?Ð°Ð¼Ð¾ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð¸Ð¼Ð° Ð¿Ñ?ÐµÐºÐ¾ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ ÐºÐ¾Ñ?Ð° Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° â??DKIMâ??,\n"
@@ -62,14 +57,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(Ð?Ð·Ð²Ð¸Ñ?Ð°Ð²Ð°Ð¼Ð¾ Ñ?Ðµ Ð°ÐºÐ¾ Ð½Ð¸Ñ?Ñ?Ðµ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð°Ð»Ð¸ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?. Ð¡ Ð¾Ð±Ð·Ð¸Ñ?Ð¾Ð¼ Ð½Ð° Ñ?Ð¾ Ð´Ð° Ð?Ð°Ñ?Ð°\n"
@@ -79,13 +72,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "Ð£Ð¿Ð°Ð¼Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ð´Ð° Ð¾Ð±Ñ?Ð°Ð´Ð¸Ð¼Ð¾ HTML Ð¸Ð»Ð¸ base64\n"
@@ -93,13 +84,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Ð?ÐºÐ¾ Ð¸Ð¼Ð°Ñ?Ðµ Ð±Ð¸Ð»Ð¾ ÐºÐ°ÐºÐ²Ð° Ð¿Ð¸Ñ?Ð°Ñ?Ð°, ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð½Ð°Ñ?\n"
@@ -107,13 +96,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Ð?Ð¾Ñ?Ð»Ð°Ñ?Ñ? Ð?Ð°Ð¼ Tor Ð¿Ð°ÐºÐµÑ? Ð°ÐºÐ¾ Ð¼Ð¸ ÐºÐ°Ð¶ÐµÑ?Ðµ ÐºÐ°ÐºÐ°Ð² Ð¶ÐµÐ»Ð¸Ñ?Ðµ.\n"
@@ -121,38 +108,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
-"Ð?Ð¾Ð»Ð¸Ð¼Ð¾ Ð?Ð°Ñ? Ð´Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ñ?ÐµÐºÐ¾ Ð°Ð´Ñ?ÐµÑ?Ðµ gettor@xxxxxxxxxxxxxx, Ð¸\n"
+"Ð?Ð¾Ð»Ð¸Ð¼Ð¾ Ð?Ð°Ñ? Ð´Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ñ?ÐµÐºÐ¾ Ð°Ð´Ñ?ÐµÑ?Ðµ gettor@xxxxxxxxxxxxxx, "
+"Ð¸\n"
 "Ñ?ÐµÑ?Ð¸Ñ?Ðµ Ð½Ð°Ð¼\n"
 "Ð½Ð°Ð·Ð¸Ð² Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð¿Ð°ÐºÐµÑ?Ð° Ð±Ð¸Ð»Ð¾ Ð³Ð´Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "Ð?Ð Ð?Ð?Ð£Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð¥ Ð?Ð?Ð?Ð?Ð?Ð? TOR-Ð?\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ð»Ð¸ Ð¿Ñ?ÐµÐ²ÐµÐ´ÐµÐ½Ð¾ Ð¸Ð·Ð´Ð°Ñ?Ðµ Tor-Ð°, Ñ?Ð½ÐµÑ?Ð¸Ñ?Ðµ\n"
@@ -160,14 +142,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "Ð?Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð¼ÐµÑ? Ð´Ð°Ñ?Ðµ Ð?Ð°Ð¼ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð°Ð½Ð¸ Ð¿Ð°ÐºÐµÑ? Ñ? Ð¿Ñ?ÐµÐ²ÐµÐ´ÐµÐ½Ð¾Ð¼,\n"
@@ -176,31 +156,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸Ñ? Ñ?ÐµÐ·Ð¸ÐºÐ°:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "Ð?Ð²Ð´Ðµ Ñ?Ðµ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ñ?ÐµÐ·Ð¸ÐºÐ°:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -211,9 +186,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: Ð?Ñ?Ð°Ð¿Ñ?ÐºÐ¸\n"
@@ -230,37 +203,30 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "Ð?ÐºÐ¾ Ð½Ðµ Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ð½Ð¸Ñ?ÐµÐ´Ð°Ð½ Ñ?ÐµÐ·Ð¸Ðº, Ð¾Ð½Ð´Ð° Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð¸Ñ?Ð¸ ÐµÐ½Ð³Ð»ÐµÑ?ÐºÐ¾ Ð¸Ð·Ð´Ð°Ñ?Ðµ.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð¢Ð?\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "Ð?ÐºÐ¾ Ð?Ð°Ð¼ Ñ?Ðµ Ð¿Ñ?Ð¾Ð¿Ñ?Ñ?Ð½Ð¸ Ð¾Ð¿Ñ?ÐµÐ³ Ð¼Ð°Ð»Ð¸ Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ? Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ?Ð°Ð²Ð° \n"
@@ -270,23 +236,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "Ð£ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ñ?Ñ?Ð½Ñ? Ñ?ÐµÑ? â??splitâ?? Ð½ÐµÐ³Ð´Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸ ÐºÐ°Ð¾:\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "Ð¡Ð»Ð°Ñ?Ðµ Ð¾Ð²Ð¾Ð³ Ñ?ÐµÐºÑ?Ñ?Ð° Ð½Ð° GetTor Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¾ Ð´Ð° Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ð°Ñ?ÐµÐ¼Ð¾ \n"
@@ -294,13 +256,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "Ð?Ð°ÐºÐ¾Ð½ Ñ?Ñ?Ð¾ Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð¸Ð»Ð¸ Ñ?Ð²Ðµ Ð´ÐµÐ»Ð¾Ð²Ðµ, Ð¼Ð¾Ñ?Ð°Ñ?Ðµ Ð´Ð° Ð¸Ñ? Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ñ?Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ñ? \n"
@@ -308,25 +268,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "1) Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ðµ Ñ?Ð²Ðµ Ð¿Ñ?Ð¸Ð¼Ñ?ÐµÐ½Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ Ñ? Ñ?ÐµÐ´Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð½Ð° Ð´Ð¸Ñ?ÐºÑ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
 "2) Ð?Ñ?Ð¿Ð°ÐºÑ?Ñ?Ñ?Ðµ Ñ?Ð²Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ ÐºÐ¾Ñ?Ðµ Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð°Ñ?Ñ? Ñ?Ð° â??.zâ??. Ð?ÐºÐ¾ Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð»Ð¸ Ñ?Ð²Ðµ\n"
@@ -335,29 +290,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3) Ð?Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? ÐºÐ¾Ñ?Ð° Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð° Ð½Ð° â??.ex_RENAMEâ?? Ñ? â??.exeâ??, ÐºÐ°Ð¾ Ð¸ \n"
-"Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? â??.ex_RENAME.ascâ?? Ñ?\n"
-"â??.exe.ascâ??\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "4) Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð¸Ð¼Ð°Ñ?Ðµ Ñ?Ð²Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ ÐºÐ¾Ñ?Ðµ Ñ?Ñ? Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸ \n"
@@ -365,14 +302,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
 "5) Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ ÐºÐ¾Ñ?Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¾Ñ?Ð¿Ð°ÐºÑ?Ñ?Ðµ Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¸Ñ? Ð°Ñ?Ñ?Ð¸Ð²Ð°. Ð?Ð° \n"
@@ -381,26 +316,21 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "Ð?Ð° Ð±Ð¸Ñ?Ñ?Ðµ Ð¾Ñ?Ð¿Ð°ÐºÐ¾Ð²Ð°Ð»Ð¸ Tor Ð¿Ð°ÐºÐµÑ?, Ð´Ð²Ð°Ð¿Ñ?Ñ? ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð¸Ð·Ð²Ñ?Ñ?Ð½Ñ? (.exe) Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "6) Ð?Ð°ÐºÐ¾Ð½ Ñ?Ñ?Ð¾ Ñ?Ðµ Ð¾Ñ?Ð¿Ð°ÐºÐ¸Ð²Ð°Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð¸, Ð²Ð¸Ð´ÐµÑ?ÐµÑ?Ðµ Ð½Ð¾Ð²Ð¾Ð½Ð°Ð¿Ñ?Ð°Ð²Ñ?ÐµÐ½Ñ? \n"
@@ -409,35 +339,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "7) Ð¢Ð¾ Ð±Ð¸ Ð±Ð¸Ð»Ð¾ Ñ?Ð¾. Ð¥Ð²Ð°Ð»Ð° Ð?Ð°Ð¼ Ñ?Ñ?Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Tor!\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"Ð?Ð?Ð?Ð Ð¨Ð?Ð?\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "Ð?Ð²Ð´Ðµ Ñ?Ðµ Ð½Ð°Ð»Ð°Ð·Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ ÐºÐ¾Ñ?Ð¸ Ñ?Ñ?Ðµ Ñ?Ñ?Ð°Ð¶Ð¸Ð»Ð¸ Ñ?Ð¿Ð°ÐºÐ¾Ð²Ð°Ð½ Ñ? Ð°Ñ?Ñ?Ð¸Ð²Ñ?. Ð?Ñ?Ð¿Ð°ÐºÑ?Ñ?Ñ?Ðµ Ð³Ð°\n"
@@ -445,13 +364,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "Ð¡Ð°Ð²ÐµÑ?: Ð°ÐºÐ¾ Ð?Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð½Ð°Ñ? Ð¸Ð¼Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½ GnuPG, ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ gpg\n"
@@ -459,37 +376,20 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "Ð?Ð°Ð²Ñ?Ñ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð±Ð¸ Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¾ Ð´Ð° Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð¾Ð²Ð°ÐºÐ¾ Ð½ÐµÐºÐ°ÐºÐ¾:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "Ð?ÐºÐ¾ Ñ?Ðµ Ð½Ðµ Ñ?Ð°Ð·Ñ?Ð¼ÐµÑ?Ðµ Ð±Ð°Ñ? Ð½Ð°Ñ?Ð±Ð¾Ñ?Ðµ Ñ? Ð°Ð»Ð°Ñ?ÐºÐµ ÐºÐ¾Ñ?Ðµ Ñ?Ð°Ð´Ðµ Ð¿Ñ?ÐµÐºÐ¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ,\n"
@@ -498,17 +398,15 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Ð?ÐºÐ¾ Ð?Ð°Ñ?Ð° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð²ÐµÐ·Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿ Tor Ð¼Ñ?ÐµÐ¶Ð¸, Ñ?Ñ?ÐµÐ±Ð°Ñ?Ðµ Ð?Ð°Ð¼\n"
@@ -521,15 +419,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð¾Ñ?Ð¸ Ð´Ð¾ Ð±Ñ?Ð¸Ñ?Ð° Ñ?Ð»Ð°Ñ?ÐµÐ¼ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ¾Ñ?Ð° Ñ?Ð°Ð´Ñ?Ð¶Ð¸ â??get bridgesâ??\n"
@@ -538,14 +432,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the\n"
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "Ð?Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ðµ Ð¸ Ð´Ð° Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð±Ñ?Ð¸Ñ?ÐµÐ²Ðµ Ñ? Ð²ÐµÐ± Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?ÐµÐ¼ Ð¿Ñ?ÐµÐºÐ¾ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ\n"
@@ -553,16 +444,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?:\n"
@@ -573,13 +462,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "Ð?Ð°ÐºÐµÑ?Ð¸ Ñ?Ðµ Ð¼Ð¾Ð³Ñ? Ð¸Ð·Ð¼ÐµÑ?Ð°Ñ?Ð¸! Ð£Ð²ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð¸Ð»Ð¸\n"
@@ -587,16 +474,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Ð¥Ð²Ð°Ð»Ð° Ð?Ð°Ð¼ Ð½Ð° Ð·Ð°Ñ?Ñ?ÐµÐ²Ñ?. Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð³Ð° Ð¾Ð±Ñ?Ð°Ñ?Ñ?Ñ?ÐµÐ¼Ð¾.\n"
@@ -604,16 +487,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
 "Ð?ÐºÐ¾ Ð?Ð°Ð¼ Ð½Ðµ Ñ?Ñ?Ð¸Ð³Ð½Ðµ, Ð¿Ð°ÐºÐµÑ? Ñ?Ðµ Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð½Ð¾ Ð¿Ñ?ÐµÐ²ÐµÐ»Ð¸ÐºÐ¸ Ð·Ð° Ð?Ð°Ñ? Ð¿Ñ?Ð¾Ð²Ð°Ñ?Ð´ÐµÑ?.\n"
@@ -623,18 +501,50 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "Ð?Ð°Ð¶Ð°Ð»Ð¾Ñ?Ñ?, Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ñ?Ðµ Ñ?Ñ?Ñ?Ñ?ÐµÑ?ÐµÐ¼Ð¾ Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸Ð¼Ð° Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ñ?Ñ?Ð»Ð¸Ñ?Ð¸Ñ?Ð¸\n"
 "Ð?Ð°Ñ? Ð·Ð°Ñ?Ñ?ÐµÐ² Ñ? Ð¾Ð²Ð¾Ð¼ Ñ?Ñ?ÐµÐ½Ñ?Ñ?ÐºÑ?. Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð½Ðµ Ñ?ÐµÑ?Ð¸Ð¼Ð¾ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼.\n"
 "\n"
 "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3) Ð?Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? ÐºÐ¾Ñ?Ð° Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð° Ð½Ð° â??.ex_RENAMEâ?? Ñ? â??.exeâ??, ÐºÐ°Ð¾ "
+#~ "Ð¸ \n"
+#~ "Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? â??.ex_RENAME.ascâ?? Ñ?\n"
+#~ "â??.exe.ascâ??\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Ð?Ð?Ð?Ð Ð¨Ð?Ð?\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
diff --git a/i18n/st/gettor.po b/i18n/st/gettor.po
index e7e6736..a711308 100644
--- a/i18n/st/gettor.po
+++ b/i18n/st/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/su/gettor.po b/i18n/su/gettor.po
index e7e6736..a711308 100644
--- a/i18n/su/gettor.po
+++ b/i18n/su/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/sv/gettor.po b/i18n/sv/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/sv/gettor.po
+++ b/i18n/sv/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/sw/gettor.po b/i18n/sw/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/sw/gettor.po
+++ b/i18n/sw/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ta/gettor.po b/i18n/ta/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ta/gettor.po
+++ b/i18n/ta/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/te/gettor.po b/i18n/te/gettor.po
index e7e6736..a711308 100644
--- a/i18n/te/gettor.po
+++ b/i18n/te/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/templates/gettor.pot b/i18n/templates/gettor.pot
index bde6250..f0160bb 100644
--- a/i18n/templates/gettor.pot
+++ b/i18n/templates/gettor.pot
@@ -8,134 +8,94 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/tg/gettor.po b/i18n/tg/gettor.po
index e7e6736..a711308 100644
--- a/i18n/tg/gettor.po
+++ b/i18n/tg/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/th/gettor.po b/i18n/th/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/th/gettor.po
+++ b/i18n/th/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/ti/gettor.po b/i18n/ti/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ti/gettor.po
+++ b/i18n/ti/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/tk/gettor.po b/i18n/tk/gettor.po
index e7e6736..a711308 100644
--- a/i18n/tk/gettor.po
+++ b/i18n/tk/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/tr/gettor.po b/i18n/tr/gettor.po
index fe82842..11be724 100644
--- a/i18n/tr/gettor.po
+++ b/i18n/tr/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-12-02 12:14+0200\n"
 "Last-Translator: yunus kaba <yunuskaba@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,14 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Merhaba, bu bir \"GetTor\" robotu.\n"
@@ -33,14 +31,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "Maalesef, vermiÅ? olduÄ?unuz adresten size ulaÅ?amÄ±yoruz. Ä°steÄ?inizi\n"
@@ -49,14 +45,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "Ã?zgÃ¼nÃ¼z sadece adres bilginizi doÄ?ruluyan \"DKIM\" hizmetini destekleyen,\n"
@@ -65,14 +59,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(E-posta adresini daha Ã¶nce sormadÄ±Ä?Ä±mÄ±z iÃ§in Ã¶zÃ¼r dileriz. \n"
@@ -82,13 +74,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "Bilginize, HTML ve base 64 formatlÄ± e-postalarla iÅ?lem yapamÄ±yoruz.\n"
@@ -96,13 +86,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Her soru ve sorunlarÄ±nÄ±zÄ± aÅ?aÄ?Ä±da verilen e-posta adresine\n"
@@ -111,13 +99,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "I will mail you a Tor package, if you tell me which one you want.\n"
@@ -125,13 +111,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
@@ -139,23 +123,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "OBTAINING LOCALIZED VERSIONS OF TOR\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "Tor'un dilinize Ã§evrilmiÅ? bir sÃ¼rÃ¼mÃ¼nÃ¼ edinmek iÃ§in\n"
@@ -163,41 +143,33 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Desteklenen yerellerin listesi:\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "Desteklenen diller:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -208,9 +180,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar@xxxxxxxxxxxxxx: ArapÃ§a\n"
@@ -227,282 +197,176 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "Herhangi bir dil seÃ§mezseniz, ingilizce versiyonu kullanacak.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "DAHA KÃ?Ã?Ã?K BOYUTLU PAKETLER\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "    1.) AldÄ±Ä?Ä±n tÃ¼m ekleri bir dosyaya kaydet.\n"
 "    \n"
 "    "
 
-#: lib/gettor/constants.py:529
-msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
-"        DosyayÄ± aÃ§mak iÃ§in, \".exe\" uzantÄ±lÄ± dosyaya Ã§ift tÄ±klamanÄ±z yeterli.\n"
+"        DosyayÄ± aÃ§mak iÃ§in, \".exe\" uzantÄ±lÄ± dosyaya Ã§ift tÄ±klamanÄ±z "
+"yeterli.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:585
-msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 
 #~ msgid ""
@@ -514,10 +378,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -528,16 +394,17 @@ msgstr ""
 #~ "    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\n"
 #~ "        "
 #~ msgstr ""
-#~ "Merhaba! Bu \"GetTor\" robotudur.Maalesef, size bu adreste cevap vermeyeceÄ?iz. "
-#~ "GMAIL.COM'dan ya da YAHOO.CN'den bir hesap aÃ§malÄ± ve bu e-posta "
-#~ "hesaplarÄ±nÄ±n birinden e-posta gÃ¶ndermelisiniz. Biz sadece, bize gÃ¶nderilen "
-#~ "e-postanÄ±n \"Kimden\" bÃ¶lÃ¼mÃ¼nde yazan e-posta adresinin gerÃ§ek gÃ¶nderici "
-#~ "adresi olduÄ?unu doÄ?rulamamÄ±zÄ± saÄ?layan, bir e-posta Ã¶zelliÄ?i olan \"DKIM\"i "
-#~ "destekleyen e-posta servislerinden gelen istekleri iÅ?liyoruz.(EÄ?er siz bu "
-#~ "posta iÃ§in sormadÄ±ysanÄ±z Ã¶zÃ¼r dileriz. Sizin e-postanÄ±z DKIM'i kullanmayan "
-#~ "bir servisten geldiÄ?i iÃ§in kÄ±sa bir aÃ§Ä±klama gÃ¶nderiyoruz ve sonrasÄ±nda bir "
-#~ "sonraki gÃ¼n ya da daha sonraki gÃ¼nlerde bu e-posta adresini "
-#~ "yoksayacaÄ?Ä±z.)LÃ¼tfen bizim HTML ya da base 64 e-postalarÄ±nÄ± iÅ?leyemediÄ?imiz "
-#~ "dikkat edin. Sizin dÃ¼z metin gÃ¶ndermeye ihtiyacÄ±nÄ±z olacak. EÄ?er herhangi "
-#~ "bir sorunuz olursa veya Ã§alÄ±Å?mazsa bu destek e-postasÄ±ndaki bir insanla "
-#~ "iletiÅ?im kurabilirsiniz: tor-assistants@xxxxxxxxxxxxxx"
+#~ "Merhaba! Bu \"GetTor\" robotudur.Maalesef, size bu adreste cevap "
+#~ "vermeyeceÄ?iz. GMAIL.COM'dan ya da YAHOO.CN'den bir hesap aÃ§malÄ± ve bu e-"
+#~ "posta hesaplarÄ±nÄ±n birinden e-posta gÃ¶ndermelisiniz. Biz sadece, bize "
+#~ "gÃ¶nderilen e-postanÄ±n \"Kimden\" bÃ¶lÃ¼mÃ¼nde yazan e-posta adresinin gerÃ§ek "
+#~ "gÃ¶nderici adresi olduÄ?unu doÄ?rulamamÄ±zÄ± saÄ?layan, bir e-posta Ã¶zelliÄ?i "
+#~ "olan \"DKIM\"i destekleyen e-posta servislerinden gelen istekleri "
+#~ "iÅ?liyoruz.(EÄ?er siz bu posta iÃ§in sormadÄ±ysanÄ±z Ã¶zÃ¼r dileriz. Sizin e-"
+#~ "postanÄ±z DKIM'i kullanmayan bir servisten geldiÄ?i iÃ§in kÄ±sa bir aÃ§Ä±klama "
+#~ "gÃ¶nderiyoruz ve sonrasÄ±nda bir sonraki gÃ¼n ya da daha sonraki gÃ¼nlerde bu "
+#~ "e-posta adresini yoksayacaÄ?Ä±z.)LÃ¼tfen bizim HTML ya da base 64 e-"
+#~ "postalarÄ±nÄ± iÅ?leyemediÄ?imiz dikkat edin. Sizin dÃ¼z metin gÃ¶ndermeye "
+#~ "ihtiyacÄ±nÄ±z olacak. EÄ?er herhangi bir sorunuz olursa veya Ã§alÄ±Å?mazsa bu "
+#~ "destek e-postasÄ±ndaki bir insanla iletiÅ?im kurabilirsiniz: tor-"
+#~ "assistants@xxxxxxxxxxxxxx"
diff --git a/i18n/uk/gettor.po b/i18n/uk/gettor.po
index 009caed..f2a6381 100644
--- a/i18n/uk/gettor.po
+++ b/i18n/uk/gettor.po
@@ -6,37 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-05-26 15:28-0600\n"
 "Last-Translator: Eugene Briskin <phirelli@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, Ð¦Ðµ Ð Ð¾Ð±Ð¾Ñ? \"GetTor\". Ð?Ñ?ÐºÑ?Ñ? Ð²Ð°Ð¼ Ð·Ð° Ð²Ð°Ñ? Ð·Ð°Ð¿Ð¸Ñ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "Ð?Ð° Ð¶Ð°Ð»Ñ?, Ð¼Ð¸ Ð½Ðµ Ð·Ð¼Ð¾Ð³Ð»Ð¸ Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð²Ð°Ð¼ Ð½Ð° Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?. Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ð¾ Ñ?Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸\n"
@@ -44,30 +41,27 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
-"Ð?Ð¸ Ð¾Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ñ?Ñ?Ð¼Ð¾ Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ð»Ð¸Ñ?Ðµ Ð· Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ? Ñ?ÐµÑ?Ð²Ñ?Ñ?Ñ?Ð² Ñ?Ð¾ Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼ÐºÑ? \"DKIM\", Ñ?Ð¾\n"
+"Ð?Ð¸ Ð¾Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ñ?Ñ?Ð¼Ð¾ Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ð»Ð¸Ñ?Ðµ Ð· Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¸Ñ? Ñ?ÐµÑ?Ð²Ñ?Ñ?Ñ?Ð² Ñ?Ð¾ Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼ÐºÑ? \"DKIM\", "
+"Ñ?Ð¾\n"
 "Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ñ? Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?, Ñ?ÐºÐ° Ð´Ð¾Ð·Ð²Ð¾Ð»Ñ?Ñ? Ð½Ð°Ð¼ Ð¿ÐµÑ?ÐµÐ²Ñ?Ñ?Ñ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð´ Ð»Ñ?Ð´ÐµÐ¹, Ñ?Ð¾ Ð´Ñ?Ð¹Ñ?Ð½Ð¾\n"
 "Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¸ Ð½Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "(Ð?Ð¸ Ð¿ÐµÑ?ÐµÐ¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð¼Ð¾ Ñ?ÐºÑ?Ð¾ Ð²Ð¸ Ð½Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ð»Ð¸ Ð²Ñ?Ð´Ñ?Ð¸Ð»Ð°Ñ?Ð¸ Ð²Ð°Ð¼ Ñ?Ñ?Ð¾Ð³Ð¾ Ð»Ð¸Ñ?Ñ?Ð°. Ð¢Ð°Ðº Ñ?Ðº Ð²Ð°Ñ?Ð°\n"
@@ -76,13 +70,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "Ð?Ñ?Ð´Ñ?-Ð»Ð°Ñ?ÐºÐ° Ð·Ð°Ð¿Ð°Ð¼'Ñ?Ð°Ð¹Ñ?Ðµ Ñ?Ðµ Ð·Ð°Ñ?Ð°Ð·, Ð¼Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ð¾Ð±Ñ?Ð¾Ð±Ð»Ñ?Ñ?Ð¸ HTML Ð»Ð¸Ñ?Ñ?Ð¸ Ñ? ÐµÐ¼ÐµÐ¹Ð»\n"
@@ -90,13 +82,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Ð¯ÐºÑ?Ð¾ Ñ? Ð²Ð°Ñ? Ñ? Ð±Ñ?Ð´Ñ?-Ñ?ÐºÑ? Ð¿Ð¸Ñ?Ð°Ð½Ð½Ñ?, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð·Ð²'Ñ?Ð·Ð°Ñ?Ð¸Ñ?Ñ? Ð· Ð½Ð°Ñ?Ð¾Ñ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼ÐºÐ¾Ñ? Ð·Ð°\n"
@@ -104,13 +94,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Ð¯ Ð½Ð°Ð´Ñ?Ñ?Ð»Ñ? Ð²Ð°Ð¼ Ð¿Ð°ÐºÐµÑ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ Tor, Ñ?ÐºÑ?Ð¾ Ð²Ð¸ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð¸Ñ?Ðµ Ð¼ÐµÐ½Ñ? Ñ?ÐºÐ¸Ð¹ Ð¿Ð°ÐºÐµÑ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼\n"
@@ -118,65 +106,47 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Ð?Ñ?Ð´Ñ?-Ð»Ð°Ñ?ÐºÐ° Ð¿Ñ?Ñ?Ð»Ñ? Ð²Ð¸Ð±Ð¾Ñ?Ñ? Ð¿Ð°ÐºÐµÑ?Ð° Ð½Ð°Ð´Ñ?Ñ?Ð»Ñ?Ñ?Ñ? Ð»Ð¸Ñ?Ñ? Ð½Ð° Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?\n"
-"gettor@xxxxxxxxxxxxxx, Ñ?Ð° Ð½Ð°Ð¿Ð¸Ñ?Ñ?Ñ?Ñ? Ð¼ÐµÐ½Ñ? Ð½Ð°Ð·Ð²Ñ? Ð¿Ð°ÐºÐµÑ?Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ Ð´ÐµÑ?Ñ? Ð½Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐºÑ?\n"
+"gettor@xxxxxxxxxxxxxx, Ñ?Ð° Ð½Ð°Ð¿Ð¸Ñ?Ñ?Ñ?Ñ? Ð¼ÐµÐ½Ñ? Ð½Ð°Ð·Ð²Ñ? Ð¿Ð°ÐºÐµÑ?Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ Ð´ÐµÑ?Ñ? Ð½Ð° "
+"Ð¿Ð¾Ñ?Ð°Ñ?ÐºÑ?\n"
 "Ð²Ð°Ñ?Ð¾Ð³Ð¾ Ð»Ð¸Ñ?Ñ?Ð°.\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -187,272 +157,159 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:499
-msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 
 #~ msgid ""
@@ -464,10 +321,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -486,14 +345,14 @@ msgstr ""
 #~ "    Ð°ÐºÐ°Ñ?Ð½Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²Ñ?Ñ?Ñ? GMAIL.COM Ð°Ð±Ð¾ YAHOO.CN Ñ?Ð° Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?\n"
 #~ "    Ð· Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð· Ñ?Ð¸Ñ? Ñ?Ð°Ð¹Ñ?Ñ?Ð².\n"
 #~ "\n"
-#~ "    Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ð´Ð°Ñ?Ð¸ Ð½Ð° Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ñ?Ñ?Ð»Ñ?ÐºÐ¸ Ð· email-Ñ?ÐµÑ?Ð²Ñ?Ñ?Ñ?Ð² Ñ?ÐºÑ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼Ñ?Ñ?Ñ?Ñ? "
-#~ "\"DKIM\",\n"
+#~ "    Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ð²Ñ?Ð´Ð¿Ð¾Ð²Ñ?Ð´Ð°Ñ?Ð¸ Ð½Ð° Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ñ?Ñ?Ð»Ñ?ÐºÐ¸ Ð· email-Ñ?ÐµÑ?Ð²Ñ?Ñ?Ñ?Ð² Ñ?ÐºÑ? "
+#~ "Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼Ñ?Ñ?Ñ?Ñ? \"DKIM\",\n"
 #~ "    Ñ?Ð¾ Ñ? Ð¾Ñ?Ð¾Ð±Ð»Ð¸Ð²Ñ?Ñ?Ñ?Ñ? email Ð²ÐµÑ?Ð¸Ñ?Ñ?ÐºÑ?Ð²Ð°Ñ?Ð¸ Ð½Ð°Ð¼ Ñ?Ð¾ Ð°Ð´Ñ?ÐµÑ?Ð° Ð² Ð³Ñ?Ð°Ñ?Ñ?\n"
 #~ "    \"From\" (Ð²Ñ?Ð´ ÐºÐ¾Ð³Ð¾) Ð½Ð°Ð»ÐµÐ¶Ð¸Ñ?Ñ? Ñ?Ð¾Ð¼Ñ?, Ñ?Ñ?Ð¾ Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ð² Ð»Ð¸Ñ?Ñ?.\n"
 #~ "\n"
 #~ "    (Ð?Ð¸ Ð²Ð¸Ð±Ð°Ñ?Ð°Ñ?Ð¼Ð¾Ñ?Ñ? Ñ?ÐºÑ?Ð¾ Ñ?Ð¸ Ð½Ðµ Ð¿Ð¸Ñ?Ð°Ð² Ð¿Ñ?Ð¾ Ñ?Ðµ. Ð¢Ð¾Ð¼Ñ? Ñ?Ð¾ Ñ?Ð²Ð¾Ñ? Ñ?ÐºÑ?Ð¸Ð½Ñ?ÐºÐ° Ð· \n"
-#~ "    Ñ?ÐµÑ?Ð²Ñ?Ñ?Ñ? Ñ?ÐºÐ¸Ð¹ Ð½Ðµ Ð¿Ñ?Ð´Ñ?Ð¸Ð¼Ñ?Ñ? Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? DKIM, Ð¼Ð¸ Ð½Ð°Ð´Ñ?Ð¸Ð»Ð°Ñ?Ð¼Ð¾ Ñ?Ð¾Ð±Ñ? ÐºÐ¾Ñ?Ð¾Ñ?ÐºÐµ "
-#~ "Ñ?Ð¾Ð·Ñ?Ñ?Ð½ÐµÐ½Ð½Ñ?,\n"
+#~ "    Ñ?ÐµÑ?Ð²Ñ?Ñ?Ñ? Ñ?ÐºÐ¸Ð¹ Ð½Ðµ Ð¿Ñ?Ð´Ñ?Ð¸Ð¼Ñ?Ñ? Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? DKIM, Ð¼Ð¸ Ð½Ð°Ð´Ñ?Ð¸Ð»Ð°Ñ?Ð¼Ð¾ Ñ?Ð¾Ð±Ñ? "
+#~ "ÐºÐ¾Ñ?Ð¾Ñ?ÐºÐµ Ñ?Ð¾Ð·Ñ?Ñ?Ð½ÐµÐ½Ð½Ñ?,\n"
 #~ "    Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ð¼Ð¸ Ð±Ñ?Ð´ÐµÐ¼Ð¾ Ñ?Ð³Ð½Ð¾Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ?ÐµÐ¹ Ð°Ð´Ñ?ÐµÑ? Ð½Ð° Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ñ? Ð´Ð½Ñ?.)\n"
 #~ "\n"
 #~ "    Please note that currently, we can't process HTML emails or base 64\n"
diff --git a/i18n/ur/gettor.po b/i18n/ur/gettor.po
index 4faafad..7769e4d 100644
--- a/i18n/ur/gettor.po
+++ b/i18n/ur/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-09-15 09:05+0200\n"
 "Last-Translator: ahmedsalman <ahmed.salman@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,185 +17,146 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
-msgstr "\n"
-"Ø¢Ù¾ Ú©Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ú©Ø§ Ø´Ú©Ø±Û?Û?"
+"Thank you for your request."
+msgstr ""
 "\n"
+"Ø¢Ù¾ Ú©Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ú©Ø§ Ø´Ú©Ø±Û?Û?\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
-"Ø¨Ø¯Ù?Ø³Ù?ØªÛ? Ø³Û?, Û?Ù? Ø§Ø³ Ù¾ØªÛ? Ù¾Ø± Ø¢Ù¾ Ø¬Ù?Ø§Ø¨ Ù?Û? Ø¯Û?Úº Ú¯Û?. ØªÙ? Ú©Ù? Ú?Ø§Û?Ø¦Û?  GMAIL.COM Û?Ø§ "
-"YAHOO.CN Ú©Û? Ø³Ø§ØªÚ¾ Ø§Û?Ú© Ø§Ú©Ø§Ø¤Ù?Ù¹ Ø§Ù?Ø± Ø§Û? Ù?Û?Ù? Ø¨Ú¾Û?Ø¬Ù? Ø§Ù? Ù?Û?Úº Ø³Û? Ø§Û?Ú©"
-"\n"
+"Ø¨Ø¯Ù?Ø³Ù?ØªÛ? Ø³Û?, Û?Ù? Ø§Ø³ Ù¾ØªÛ? Ù¾Ø± Ø¢Ù¾ Ø¬Ù?Ø§Ø¨ Ù?Û? Ø¯Û?Úº Ú¯Û?. ØªÙ? Ú©Ù? Ú?Ø§Û?Ø¦Û?  GMAIL.COM Û?Ø§ YAHOO."
+"CN Ú©Û? Ø³Ø§ØªÚ¾ Ø§Û?Ú© Ø§Ú©Ø§Ø¤Ù?Ù¹ Ø§Ù?Ø± Ø§Û? Ù?Û?Ù? Ø¨Ú¾Û?Ø¬Ù? Ø§Ù? Ù?Û?Úº Ø³Û? Ø§Û?Ú©\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
-" Û?Ù? ØµØ±Ù? Ø§Ù? Ø¯Ø±Ø®Ù?Ø§Ø³Øª  Ú©Ù? Ø³Ù¾Ù?Ø±Ù¹ Ú©Ø±ØªÛ? Ú¾Û?Úº Ø¬Ù? Ø§Û? Ù?Û?Ù? DKIM  Ù¾Ø± Ø¹Ù?Ù? Ú©Ø± ØªÛ? Û?Û?"
-"\n"
+" Û?Ù? ØµØ±Ù? Ø§Ù? Ø¯Ø±Ø®Ù?Ø§Ø³Øª  Ú©Ù? Ø³Ù¾Ù?Ø±Ù¹ Ú©Ø±ØªÛ? Ú¾Û?Úº Ø¬Ù? Ø§Û? Ù?Û?Ù? DKIM  Ù¾Ø± Ø¹Ù?Ù? Ú©Ø± ØªÛ? Û?Û?\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "Û?Ù? Ù?Ø¹Ø°Ø±Øª Ú?Ø§Û?ØªÛ? Û?Û?Úº Ø§Ú¯Ø± Ø¢Ù¾ Ø§Ø³ Ø§Û? Ù?Û?Ù? Ú©Û? Ù?Ø¦Û? Ù?Û?Û?Úº Ù¾Ù?Ú?Ú¾Ø§ ØªÚ¾Ø§. Ú?Ù?Ù?Ú©Û? Ø¢Ù¾ Ú©Ø§ Ø§Û? "
 "Ù?Û?Ù? Ø³Û? Ø§Û?Ú© Ø³Ø±Ù?Ø³ Û?Û? Ø¬Ù? Ú©Û? DKIM Ø§Ø³ØªØ¹Ù?Ø§Ù? Ù?Û?Û?Úº Ú©Ø±ØªØ§, Û?Ù? Ù?Û? Ø§Û?Ú© Ù?Ø®ØªØµØ± Ù?Ø¶Ø§ØØª Ø¨Ú¾Û?Ø¬ "
 "Ø±Û?Û? Û?Û?Úº, Ø§Ù?Ø± Ù¾Ú¾Ø± Û?Ù? Ø§Ø³ Ø§Û? Ù?Û?Ù? Ø§Û?Ú?Ø±Û?Ø³ Ú©Ù? Ù?Ø¸Ø± Ø§Ù?Ø¯Ø§Ø² Ú©Ø± Ø¯Û?Úº Ú¯Û?, Ø§Ú¯Ù?Û? Ø¯Ù? Û?Ø§ Ø§Ø³ "
-"Ø³Û? Ø§Ú¯Û?"
-"\n"
+"Ø³Û? Ø§Ú¯Û?\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "Ø¨Ø±Ø§Û? Ù?Û?Ø±Ø¨Ø§Ù?Û? Ù?Ù?Ù¹ Ú©Ø±Û?Úº Ú©Û? Ù?Û? Ø§Ù?ØØ§Ù? Û?Ù? Ø§Û?Ú? Ù¹Û? Ø§Û?Ù? Ø§Û?Ù? Ø§Û? Ù?Û?Ù?Ø² Û?Ø§ Ø¹Ù?Ù? Ù?Û?Û?Úº Ú©Ø± "
-"Ø³Ú©ØªÛ? Û?Û?Úº Û?Ø§  64 Ø¨Û?Ø³ Ø§Û? Ù?Û?Ù?. Ø¢Ù¾ Ú©Ù? Ø³Ø§Ø¯Û? Ù?ØªÙ? Ø¨Ú¾Û?Ø¬Ù?Û? Ú©Û? Ø¶Ø±Ù?Ø±Øª Û?Ù? Ú¯Û?"
-"\n"
+"Ø³Ú©ØªÛ? Û?Û?Úº Û?Ø§  64 Ø¨Û?Ø³ Ø§Û? Ù?Û?Ù?. Ø¢Ù¾ Ú©Ù? Ø³Ø§Ø¯Û? Ù?ØªÙ? Ø¨Ú¾Û?Ø¬Ù?Û? Ú©Û? Ø¶Ø±Ù?Ø±Øª Û?Ù? Ú¯Û?\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "Ø§Ú¯Ø± Ø¢Ù¾ Ú©Ù? Ú©Ù?Ø¦Û? Ø³Ù?Ø§Ù?Ø§Øª Û?Û?Úº Ø? Û?Ø§ Û?Û? Ú©Ø§Ù? Ù?Û?Û?Úº Ú©Ø±ØªØ§, Ø¢Ù¾  Ú¾Û?Ù?Ù?Ù? Ø±Û?Ø³Ù?Ø±Ø³ Ø³Û? Ø§Ø³ Ø§Û? "
-"Ù?Û?Ù? Ø§Û?Ú?Ø±Û?Ø³ Ù¾Ø± Ø±Ø§Ø¨Ø·Û? Ú©Ø± Ø³Ú©ØªÛ? Û?Û?Úº tor-assistants@xxxxxxxxxxxxxx"
-"\n"
+"Ù?Û?Ù? Ø§Û?Ú?Ø±Û?Ø³ Ù¾Ø± Ø±Ø§Ø¨Ø·Û? Ú©Ø± Ø³Ú©ØªÛ? Û?Û?Úº tor-assistants@xxxxxxxxxxxxxx\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "Ù?Û?Úº Ø¢Ù¾ Ú©Ù? Ø§Û?Ú© Ù¹Ø§Ø± Ù¾Û?Ú©Ø¬ Ø§Û? Ù?Û?Ù? Ú©Ø±Ù? Ú¯Ø§, Ø§Ú¯Ø± Ø¢Ù¾ Ù?Ø¬Ú¾Û? Ø¨ØªØ§Ù? Ø¬Ù? Ø¢Ù¾ Ú?Ø§Û?ØªÛ? Û?Ù?. Ø¨Ø±Ø§Û? "
-"Ù?Û?Ø±Ø¨Ø§Ù?Û? Ù?Ù?Ø¯Ø±Ø¬Û? Ø°Û?Ù? Ù¾Û?Ú©Ø¬ Ú©Û? Ù?Ø§Ù? Ø³Û? Ø§Û?Ú© Ú©Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ø±Û?Úº. "
-"\n"
+"Ù?Û?Ø±Ø¨Ø§Ù?Û? Ù?Ù?Ø¯Ø±Ø¬Û? Ø°Û?Ù? Ù¾Û?Ú©Ø¬ Ú©Û? Ù?Ø§Ù? Ø³Û? Ø§Û?Ú© Ú©Ø§ Ø§Ù?ØªØ®Ø§Ø¨ Ú©Ø±Û?Úº. \n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Ø¨Ø±Ø§Û? Ù?Û?Ø±Ø¨Ø§Ù?Û? Ù?Ø¬Ú¾Û? Ø§Ø³  Ø§Û? Ù?Û?Ù? Ù¾Ø± Ø¬Ù?Ø§Ø¨ Ø±Û?Úº (togettor@xxxxxxxxxxxxxx). Ú©Û?Û?Úº Ø¨Ú¾Û? "
-"Ø¢Ù¾ Ú©Û? Ø§Û? Ù?Û?Ù? Ù?Û?Úº Ø§Û?Ú© Ù¾Û?Ú©Û?Ø¬ Ú©Ø§ Ù?Ø§Ù?. "
-"\n"
+"Ø¢Ù¾ Ú©Û? Ø§Û? Ù?Û?Ù? Ù?Û?Úº Ø§Û?Ú© Ù¾Û?Ú©Û?Ø¬ Ú©Ø§ Ù?Ø§Ù?. \n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
-"TOR Ú©Ø§ Ù?Ù?Ø§Ù?Û? Ù?Ø±Ú?Ù? ØØ§ØµÙ? Ú©Ø±Ù?Ø§"
-"    "
+"TOR Ú©Ø§ Ù?Ù?Ø§Ù?Û? Ù?Ø±Ú?Ù? ØØ§ØµÙ? Ú©Ø±Ù?Ø§    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "TOR Ú©Ø§ Ø§Û?Ú© Ù?Ø±Ú?Ù? Ø¬Ù? Ø¢Ù¾ Ú©Û? Ø²Ø¨Ø§Ù? Ù?Û?Úº ØªØ±Ø¬Ù?Û? Û?Ù?Ø§ Û?Ù?Ù?Ø¶Ø§ØØª Ú©Ø±Ù?Ø¬Ù? Ø²Ø¨Ø§Ù? Ø¢Ù¾ Ú?Ø§Û?ØªÛ? Û?Û?Úº "
-"Ø§Ø³Û? Ø§Û? Ù?Û?Ù? Ø§Û?Ú?Ø±Û?Ø³ Ù?Û?Úº"
-"\n"
+"Ø§Ø³Û? Ø§Û? Ù?Û?Ù? Ø§Û?Ú?Ø±Û?Ø³ Ù?Û?Úº\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "Û?Û? Ù?Ø«Ø§Ù? Ø¢Ù¾ Ú©Ù? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ú©Ø±Ø¯Û? Ù¾Û?Ú©Ø¬ Ù?Ù?Ø§Ù?Û? Ø·Ø± Ù¾Û? Ø¯Û? Ú¯Û?Ú?Û?Ù?Û? Ù?Ø±Ú?Ù? Ú©Û? Ù?Ø¦Û?Ù?Ù?Ø¯Ø±Ø¬Û? Ø°Û?Ù? "
-"Ú©Ù?Ú?Ø² Ù?Û?Úº Ù?Û?Ø±Ø³Øª Ù?Ù?Ø§ØØ¸Û? Ú©Ø±Û?Úº"
-"\n"
+"Ú©Ù?Ú?Ø² Ù?Û?Úº Ù?Û?Ø±Ø³Øª Ù?Ù?Ø§ØØ¸Û? Ú©Ø±Û?Úº\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
-"Ù?Ù?Ø§Ù?Û? ØÙ?Ø§Û?Øª Ú©Ø±Ø¯Û? Ù?Û?Ø±Ø³Øª"
-"    "
+"Ù?Ù?Ø§Ù?Û? ØÙ?Ø§Û?Øª Ú©Ø±Ø¯Û? Ù?Û?Ø±Ø³Øª    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
-"Û?Û? ØªÙ?Ø§Ù? Ø¯Ø³ØªÛ?Ø§Ø¨ Ø²Ø¨Ø§Ù?Ù?Úº Ú©Û? Ù?Û?Ø±Ø³Øª Û?Û?"
-"\n"
+"Û?Û? ØªÙ?Ø§Ù? Ø¯Ø³ØªÛ?Ø§Ø¨ Ø²Ø¨Ø§Ù?Ù?Úº Ú©Û? Ù?Û?Ø±Ø³Øª Û?Û?\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -206,419 +167,324 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "Ø¹Ø±Ø¨Û? Ù?Û?Úº gettor+ar@xxxxxxxxxxxxxx Ø¬Ø±Ù?Ù? Ù?Û?Úº gettor+de@xxxxxxxxxxxxxxØ§Ù?Ú¯Ø±Û?Ø²Û? "
 "Ù?Û?Úº gettor+en@xxxxxxxxxxxxxxÛ?Ø³Ù¾Ø§Ù?Ù?Û? Ù?Û?Úº  gettor+es@xxxxxxxxxxxxxxÙ?Ø§Ø±Ø³Û? "
-"(Ø§Û?Ø±Ø§Ù?) Ù?Û?Úº gettor+fa@xxxxxxxxxxxxxxÙ?Ø±Ø§Ù?Ø³Û?Ø³Û? Ù?Û?Úº "
-"gettor+fr@xxxxxxxxxxxxxxØ§Ø·Ø§Ù?Ù?Û? Ù?Û?Úº gettor+it@xxxxxxxxxxxxxxÚ?Ú? Ù?Û?Úº "
-"gettor+nl@xxxxxxxxxxxxxxÙ¾Ù?Ù?Û?Ù?Ú? Ù?Û?Úº gettor+pl@xxxxxxxxxxxxxxØ±Ù?Ø´Û?Ù? Ù?Û?Úº "
-"gettor+ru@xxxxxxxxxxxxxxÚ?Û?Ù?Û? Ù?Û?Úº gettor+zh@xxxxxxxxxxxxxx"
-"\n"
+"(Ø§Û?Ø±Ø§Ù?) Ù?Û?Úº gettor+fa@xxxxxxxxxxxxxxÙ?Ø±Ø§Ù?Ø³Û?Ø³Û? Ù?Û?Úº gettor+fr@torproject."
+"orgØ§Ø·Ø§Ù?Ù?Û? Ù?Û?Úº gettor+it@xxxxxxxxxxxxxxÚ?Ú? Ù?Û?Úº gettor+nl@xxxxxxxxxxxxxxÙ¾Ù?Ù?Û?Ù?Ú? "
+"Ù?Û?Úº gettor+pl@xxxxxxxxxxxxxxØ±Ù?Ø´Û?Ù? Ù?Û?Úº gettor+ru@xxxxxxxxxxxxxxÚ?Û?Ù?Û? Ù?Û?Úº gettor"
+"+zh@xxxxxxxxxxxxxx\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
-"Ø§Ú¯Ø± Ø¢Ù¾ Ù?Û? Ú©Ù?Ø¦Û? Ø²Ø¨Ø§Ù? Ù?Ù?ØªØ®Ø¨ Ù?Û? Ú©Û? ØªÙ? Ø¢Ù¾ Ø§Ù?Ú¯Ø±Û?Ø²Û? Ù?Ø±Ú?Ù? ØØ§ØµÙ? Ú©Ø±Û?Úº Ú¯Û?"
-"\n"
+"Ø§Ú¯Ø± Ø¢Ù¾ Ù?Û? Ú©Ù?Ø¦Û? Ø²Ø¨Ø§Ù? Ù?Ù?ØªØ®Ø¨ Ù?Û? Ú©Û? ØªÙ? Ø¢Ù¾ Ø§Ù?Ú¯Ø±Û?Ø²Û? Ù?Ø±Ú?Ù? ØØ§ØµÙ? Ú©Ø±Û?Úº Ú¯Û?\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
-"Ú?Ú¾Ù?Ù¹Û? Ø³Ø§Ø¦Ø² Ú©Û? Ù¾Û?Ú©Ø¬Ø²"
-"    "
+"Ú?Ú¾Ù?Ù¹Û? Ø³Ø§Ø¦Ø² Ú©Û? Ù¾Û?Ú©Ø¬Ø²    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
 "Ø§Ú¯Ø± Ø¢Ù¾ Ú©Û? Ø¨Û?Ù?Ú? Ù?Ú?ØªÚ¾ Ú©Ù? Û?Û?, Û?Ø§ Ø¢Ù¾ Ú©Ù? Ø³Ø±Ù?Ø³ Ù?Ø±Ø§Û?Ù? Ú©Ø±Ù?Û? Ù?Ø§Ù?Û? Ø¢Ù¾ Ú©Ù? Ø§Ù¾Ù?Û? Ø§Û? Ù?Û?Ù? "
 "Ù?Û?Úº Ø¨Ú?Û? Ù?Ù?ØÙ?Ø§Øª ØØ§ØµÙ? Ú©Ø±Ù?Û? Ú©Û? Ø§Ø¬Ø§Ø²Øª Ù?Û?Û?Úº Ø¯Û?ØªØ§, Ù?Û?Ø§Úº GetTor Ú©Û? Ø§Û?Ú© Ø®ØµÙ?ØµÛ?Øª Û?Û? "
 "Û?Û?, Ø¢Ù¾ Ø§Ø³Û? Ú?Ú¾Ù?Ù¹Û? Ù¾Û?Ú©Û?Ø¬ Ú©Û? Ø§Û?Ú© Ø¨Ú?Û? ØªØ¹Ø¯Ø§Ø¯ Ø¨Ú¾Û?Ø¬Ù?Û? Ú©Û? Ù?Ø¦Û? Ø§Ø³ØªØ¹Ù?Ø§Ù? Ú©Ø± Ø³Ú©ØªÛ? Û?Û?Úº, "
-"Ø¨Ø¬Ø§Ø¦Û? Ø§Û?Ú© Ø¨Ú?Û? Ø³Û? Ú©Û?"
-"\n"
+"Ø¨Ø¬Ø§Ø¦Û? Ø§Û?Ú© Ø¨Ú?Û? Ø³Û? Ú©Û?\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
-"Ø¨Ø³ Ù?Ø·Ù?Ù?Ø¨Û? Ø§Ù?Ù?Ø§Ø¸ \"Ù¹Ú©Ú?Û? Ù¹Ú©Ú?Û? Ú©Ø± Ú?Ø§Ù?Ø§\" Ø´Ø§Ù?Ù? Ú©Ø±Û?Úº, Ú©Û?Û?Úº Ø¢Ù¾Ù?Û? Ø§Û? Ù?Û?Ù? Ù?Û?Úº"
-"    "
+"Ø¨Ø³ Ù?Ø·Ù?Ù?Ø¨Û? Ø§Ù?Ù?Ø§Ø¸ \"Ù¹Ú©Ú?Û? Ù¹Ú©Ú?Û? Ú©Ø± Ú?Ø§Ù?Ø§\" Ø´Ø§Ù?Ù? Ú©Ø±Û?Úº, Ú©Û?Û?Úº Ø¢Ù¾Ù?Û? Ø§Û? Ù?Û?Ù? Ù?Û?Úº    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
 "GetTor Ú©Ù? Ø§Û?Ú© Ø¹Ø¨Ø§Ø±Øª Ú©Û? ØµÙ?Ø±Øª Ù?Û?Úº Û?Û? Ø§Û? Ù?Û?Ù? Ø¢Ù¾1.4MB Ú©Û? Ù?Ù?ØÙ?Ø§Øª Ù?Û?Úº Tor Browser "
-"BundleÚ©Ù?Ø¨Ú¾Û?Ø¬Û? Ø³Ú©ØªÛ? Û?Û?Úº"
-"\n"
+"BundleÚ©Ù?Ø¨Ú¾Û?Ø¬Û? Ø³Ú©ØªÛ? Û?Û?Úº\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "ØªÙ?Ø§Ù? ØØµÙ?Úº Ú©Û? Ù?Ù?ØµÙ?Ù? Û?Ù?Ù?Û? Ú©Û? Ø¨Ø¹Ø¯ Ø¢Ù¾ Ú©Ù? Ø§Ù?Ú¾Úº Ø¯Ù?Ø¨Ø§Ø±Û? Ø¬Ù?Ø¹ Ú©Ø±Ù?Ø§ Û?Ù? Ú¯Ø§. Ø§Ø³Ú©Ø§ Ø·Ø±Û?Ù?Û? "
-"Ø¯Ø±Ø¬ Ø°Ù?Ù? Û?Û?:"
-"\n"
+"Ø¯Ø±Ø¬ Ø°Ù?Ù? Û?Û?:\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
-"1) Ø³Ø¨ Ù?Ù?ØÙ?Ø§Øª Ú©Ù? Ø§Û?Ú© Ù?Ù?Ù?Ú?Ø± Ù?Û?Úº Ø§Ù¾Ù?Û? Ú?Ø³Ú© Ù¾Ø± Ù?ØÙ?Ù?Ø¸ Ú©Ø±Û?Úº"
-"    \n"
+"1) Ø³Ø¨ Ù?Ù?ØÙ?Ø§Øª Ú©Ù? Ø§Û?Ú© Ù?Ù?Ù?Ú?Ø± Ù?Û?Úº Ø§Ù¾Ù?Û? Ú?Ø³Ú© Ù¾Ø± Ù?ØÙ?Ù?Ø¸ Ú©Ø±Û?Úº    \n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
 "2) Z Ø³Û? Ø®ØªÙ? Û?Ù?Ù?Û? Ù?Ø§Ù?Û? ØªÙ?Ø§Ù? Ù?Ø§Ø¦Ù?Û?Úº Ú©Ú¾Ù?Ù? Ø¯Û?Úº. Ø¢Ú¯Ø± Ø¢Ù¾ ØªÙ?Ø§Ù? Ù?Ù?ØÙ?Ø§Øª Ø§Û?Ú© Ù?Ø¦Û? Ù?Ù?Ú?Ø± "
-"Ù?Û?Úº Ù?ØÙ?Ù?Ø¸ Ú©Ø±ØªÛ? Ú¾Û?Úº, ØªÙ? Ø§Ø³ Ù?Ù?Ù?Ú?Ø± Ù?Û?Úº ØªÙ?Ø§Ù? Ù?Ø§Ø¦Ù?Û?Úº Ú©Ú¾Ù?Ù?Û?Úº"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3) ex_Rename Ù?Ø§ Ø¦Ù? Ú©Ø§ Ù?Ø§Ù? ØªØ¨Ø¯Û?Ù? Ú©Ø± Ú©Û? exe. Ú©Ø±Ø¯Û?ÚºÛ?ex_RENAME.asc Ù?Ø§ Ø¦Ù? Ú©Ø§ Ù?Ø§Ù? "
-"Ø¨Ú¾Û? ØªØ¨Ø¯Û?Ù? Ú©Ø± Ú©Û? exe.asc. Ú©Ø±Ø¯Û?Úº"
-"\n"
+"Ù?Û?Úº Ù?ØÙ?Ù?Ø¸ Ú©Ø±ØªÛ? Ú¾Û?Úº, ØªÙ? Ø§Ø³ Ù?Ù?Ù?Ú?Ø± Ù?Û?Úº ØªÙ?Ø§Ù? Ù?Ø§Ø¦Ù?Û?Úº Ú©Ú¾Ù?Ù?Û?Úº\n"
 "    "
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "4) ØªÙ? Ø«Û?Ù? Ú©Ø±Û?Úº Ø§Ù? Ù?Ø§ Ø¦Ù?Ù?Úº Ú©Û? Ø¬Û?Ø³Ø§ Ú©Û? Ø§Û? Ù?Û?Ù? Ø¢Ù¾ Ú©Ù? Ø¨ØªØ§Û?Ø§ Ú¯Û?Ø§ Û?Û?   (gpg -- "
-"ØªØµØ¯Û?Ù?)"
-"\n"
+"ØªØµØ¯Û?Ù?)\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
-"5) Ø§Ø¨ Ø§Û?Ú© Ø§ Û?Ø³Ø§ Ù¾Ø±Ù?Ú¯Ø±Ø§Ù? Ø§Ø³ØªØ¹Ù?Ø§Ù? Ú©Ø±Û?Úº Ø¬Ù? multivolume RARÚ©Ù? Ø£Ø±Ú©Ø§Ø¦Û?Ù? Ú©Ø± "
-"Ø³Ú©Û?.Ù?Ù?Ú?Ù?Ø² Ù?Û?Úº Ø¹Ø§Ù? Ø·Ù? Ø± Ù¾Ø± Û?Û? Ú©Ø§Ù? winrar Ú©Ø±ØªØ§ Û?Û?.Ø§Ú¯Ø± ØªÙ?Ú¾Ø§Ø±Û? Ú©Ù?Ù¾Û?Ù?Ù¹Ø± Ù¾Ø± Ø§ "
-"Ù?Ø³Ù¹Ø§Ù? Ù?Û?Û?Úº Û?Û? ØªÙ? Ø§Ø³Û? Û?Û?Ø§Úº Ø³Û? ØØ§ØµÙ? Ú©Ø±Ù?"
-"\n"
+"5) Ø§Ø¨ Ø§Û?Ú© Ø§ Û?Ø³Ø§ Ù¾Ø±Ù?Ú¯Ø±Ø§Ù? Ø§Ø³ØªØ¹Ù?Ø§Ù? Ú©Ø±Û?Úº Ø¬Ù? multivolume RARÚ©Ù? Ø£Ø±Ú©Ø§Ø¦Û?Ù? Ú©Ø± Ø³Ú©Û?."
+"Ù?Ù?Ú?Ù?Ø² Ù?Û?Úº Ø¹Ø§Ù? Ø·Ù? Ø± Ù¾Ø± Û?Û? Ú©Ø§Ù? winrar Ú©Ø±ØªØ§ Û?Û?.Ø§Ú¯Ø± ØªÙ?Ú¾Ø§Ø±Û? Ú©Ù?Ù¾Û?Ù?Ù¹Ø± Ù¾Ø± Ø§ Ù?Ø³Ù¹Ø§Ù? "
+"Ù?Û?Û?Úº Û?Û? ØªÙ? Ø§Ø³Û? Û?Û?Ø§Úº Ø³Û? ØØ§ØµÙ? Ú©Ø±Ù?\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
-"Ø§Ù¾Ù?Û? Ù¾Û?Ú©Ø¬ Ú©Ù? Ú©Ú¾Ù?Ù?Ù?Û? Ú©Û? Ù?Û?Û? ØµØ±Ù? \"exe.\" Ù¾Ø±Ú?Ø¨Ù? Ú©Ù?Ú© Ú©Ø±Û?Úº"
-"\n"
+"Ø§Ù¾Ù?Û? Ù¾Û?Ú©Ø¬ Ú©Ù? Ú©Ú¾Ù?Ù?Ù?Û? Ú©Û? Ù?Û?Û? ØµØ±Ù? \"exe.\" Ù¾Ø±Ú?Ø¨Ù? Ú©Ù?Ú© Ú©Ø±Û?Úº\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
 "6) Ù?Ø§ Ø¦Ù? Ú©Ù? Ú©Ú¾Ù?Ù?Ù?Û? Ú©Û? Ø¨Ø¹Ø¯ Ø? Ø¢Ù¾ Ú©Ù? Ø§Û?Ú© Ù?Ø¦Û? .exe Ù?Ø§ Ø¦Ù? Ù?Ù?Û? Ú¯Û? Ø¢Ù¾ Ú©Û? Ù?Ø·Ù?Ù? Ø¨Û? "
 "Ù?Ù?Ù?Ú?Ø± Ù?Û?ÚºÛ? Ø¨Ø³ Ø§Ø³ Ù?Ù?Ú?Ø± Ù¾Û? Ú?Ø¨Ù? Ú©Ù?Ú© Ú©Ø±Û?ÚºØ? Ø§Ù?Ø± Tor Browser Bundle Ú©Ù? Ú?Ù?Ø¯ Ø³Ú©Ù?Ú? "
-"Ù?Û?Úº Ø³Ø±Ù?Ø¹ Û?Ù? Ø¬Ø§Ù?Ø§ Ú?Ø§Û?Û?Û?"
-"\n"
+"Ù?Û?Úº Ø³Ø±Ù?Ø¹ Û?Ù? Ø¬Ø§Ù?Ø§ Ú?Ø§Û?Û?Û?\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "7) Ø§Ø¨ Û?Û? Ú©Ø§Ù? Ù¾Ù?Ø±Ø§ Û?Ù? Ú¯Û?Ø§ Û?Û?Û? Tor Ø§Ø³ØªØ¹Ù?Ø§Ù? Ú©Ø±Ù?Û? Ú©Ø§ Ø´Ú©Ø±Û?Û?Û? Ø§Ø¨ Ø¢Ù¾ Ø§Ø³ Ø³Û? Ù?Ø·Ù? Ø§Ù?Ø¯Ø² "
-"Û?Ù?Ø³Ú©ØªÛ? Û?Û?ÚºÛ?"
-"    \n"
+"Û?Ù?Ø³Ú©ØªÛ? Û?Û?ÚºÛ?    \n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"ØªØ¹Ø§Ù?Ù?"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "Û?Û? Ø¢Ù¾ Ú©Ø§ Ù?Ø·Ù?Ù?Ø¨Û? Ø³Ø§Ù?Ù¹ Ù?Û?Ø¦Ø± Ø²Ù¾ Ù?Ø§Ø¦Ù? Ù?Û?Úº Û?Û?Û? Ø§Ø³ Ù¾Û?Ú©Ø¬ Ú©Ù? Ú©Ú¾Ù?Ù?Û?Úº Ø§Ù?Ø± Ø¯Ø³ØªØ®Ø· Ú©Û? "
-"ØªØµØ¯Û?Ù? Ú©Ø±Û?ÚºÛ?"
-"\n"
+"ØªØµØ¯Û?Ù? Ú©Ø±Û?ÚºÛ?\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "Ø´Ø§Ø±Û?: Ø§Ú¯Ø± Ø§Ù¾ Ú©Û? Ú©Ù?Ù¾Û?Ù?Ù¹Ø±Ù¾Ø± GnuPG Ù?ØµØ¨ Û?Û?Ø? ØªÙ? gpg Ú©Ù?Ø§Ù?Ú? Ù?Ø§Ø¦Ù? Ø·Ø±Û?Ù?Û? Ú©Ù?Ø§Ø³ØªØ¹Ù?Ø§Ù? "
-"Ú©Ø±ØªÛ? Û?Ù?Û? Ø²Ù¾ Ù?Ø§Ø¦Ù? Ú©Ù? Ú©Ú¾Ù? Ø¯Ù?"
-"\n"
+"Ú©Ø±ØªÛ? Û?Ù?Û? Ø²Ù¾ Ù?Ø§Ø¦Ù? Ú©Ù? Ú©Ú¾Ù? Ø¯Ù?\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
-"gpg ØªØµØ¯Û?Ù? <Ù¾Û?Ú©Û?Ø¬ Ú©Ø§ Ù?Ø§Ù?>.asc. <Ù¾Û?Ú©Û?Ø¬ Ú©Ø§ Ù?Ø§Ù?>"
-"\n"
+"Ø§Ø³ Ú©Û? Ù¾Û?Ø¯Ø§Ù?Ø§Ø± Ú©Ø³Û? ØØ¯ ØªÚ© Ø§Ø³ Ø·Ø±Ø Ù?Ø¸Ø± Ø¢Ù?Û? Ú?Ø§ Û?Ø¦Û?\n"
 "    "
 
-#: lib/gettor/constants.py:594
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
-"Ø§Ø³ Ú©Û? Ù¾Û?Ø¯Ø§Ù?Ø§Ø± Ú©Ø³Û? ØØ¯ ØªÚ© Ø§Ø³ Ø·Ø±Ø Ù?Ø¸Ø± Ø¢Ù?Û? Ú?Ø§ Û?Ø¦Û?"
-"\n"
+"Ø§Ú¯Ø± Ø§Ù¾ Ú©Ù?Ø§Ù?Ú? Ù?Ø§Ø¦Ù? Ø·Ø±Û?Ù?Û? Ø³Û? Ù?Ø§Ù?Ø§Ù?Ù? Û?Û? ØªÙ? ØªØµÙ?Û?Ø± Û? ØµØ§Ø±Ù? Ù?Ù?Ø§Ø¬Û? Ú©Ù? ØªÙ?Ø§Ø´ Ú©Ø±Û?Úº\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Ø§Ú¯Ø± Ø§Ù¾ Ú©Ù?Ø§Ù?Ú? Ù?Ø§Ø¦Ù? Ø·Ø±Û?Ù?Û? Ø³Û? Ù?Ø§Ù?Ø§Ù?Ù? Û?Û? ØªÙ? ØªØµÙ?Û?Ø± Û? ØµØ§Ø±Ù? Ù?Ù?Ø§Ø¬Û? Ú©Ù? ØªÙ?Ø§Ø´ Ú©Ø±Û?Úº"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:611
-msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Ø§Ú¯Ø± Ø¢Ù¾ Ú©Ø§ Ø§Ù?Ù¹Ø±Ù?Ù¹ Ú©Ù?Ú©Ø´Ù? Tor Ù?Û?Ù¹ Ù?Ø±Ú© Ú©Ù?Ø´Ù? ØªÚ© Ø±Ø³Ø§Ø¦Û? Ú©Ù? Ø¨Ù?Ø§Ú© Ú©Ø±ØªØ§ Û?Û?,Ø¢Ù¾ Ú©Ù? Ø§Û?Ú© "
 "Ù¾Ù? Ú©Û? Ø±Û?Ù?Û? Ú©Û? Ø¶Ø±Ù?Ø±Øª Û?Ù?Ø³Ú©ØªÛ? Û?Û?,Ø¨Ø±Ø¬ Ø±Ù?Û? Û?Ø§ (\"Ù¾Ù?\" Ù?Ø®ØªØµØ±),Tor Ø±Ù?Û? Ú©Û? Ù?Ø±Ú©Ø²Û? "
 "Ú?Ø§Ø¦Ø±Û?Ú©Ù¹Ø±Û? Ù?Û?Úº Ø¯Ø±Ø¬ Ù?Û?Û?Úº Û?Û?Úº, Ú?Ù?Ù?Ú©Û? Ø§Ù? Ù?Û?Úº Ø³Û? Ú©Ù?Ø¦Û? Ù?Ú©Ù?Ù? Ø¹Ù?Ø§Ù?Û? Ù?Û?Ø±Ø³Øª Ù?Û?Û?Úº Û?Û?, "
 "Û?Û?Ø§Úº ØªÚ© Ú©Û? Ø§Ú¯Ø± Ø¢Ù¾ Ú©Ø§ Ø¢Ø¦Û? Ø§Û?Ø³ Ù¾Û? Ù?Ù?Ù¹Ø±Ù?Ú¯ Ú©Ø± Ø±Û?Ø§ Û?Û?Ø? ØªÙ? Ù?Û? ØªÙ?Ø§Ù? Ù¾Ù?Ù?Úº Ú©Ù? Ø¨Ù?Ø§Ú© "
-"Ù?Û?Û?Úº Ú©Ø± Ø³Ú©Û? Ú¯Û?Û?"
-"\n"
+"Ù?Û?Û?Úº Ú©Ø± Ø³Ú©Û? Ú¯Û?Û?\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
 "Ø¢Ù¾ Ø§Ø³ Ø§Û? Ù?Û?Ù? Ø§Û?Ú?Ø±Û?Ø³ : bridges@xxxxxxxxxxxxxx Ù¾Ø±Ø§Û?Ú© Ø§Û? Ù?Û?Ù? Ø¨Û?Ø¬Ú¾ Ú©Ø±Ù¾Ù? ØØ§ØµÙ? Ú©Ø± "
-"Ø³Ú©ØªÛ? Û?Û?Úº Ø? Ø¬Ø³ Ù?Û?Úº Ù?Ú©Ú¾Ø§ Û?Ù?\"Ù¾Ù? ØØ§ØµÙ? Ú©Ø±Ù?\""
-"\n"
+"Ø³Ú©ØªÛ? Û?Û?Úº Ø? Ø¬Ø³ Ù?Û?Úº Ù?Ú©Ú¾Ø§ Û?Ù?\"Ù¾Ù? ØØ§ØµÙ? Ú©Ø±Ù?\"\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
-"Ù¾Ù? Ú©Ù? ØØ§ØµÙ? Ú©Ø±Ù?Û? Ú©Ø§ Ø·Ø±Û?Ù?Û? Û?Û? Ø¨Ú¾Û? Û?Û? Ú©Û? Ù?Û?Ø¨ Ø¨Ø±Ø§Ø¤ Ø²Ø± Ù¾Ø± Û?Û? Û?Ù?Ø¢Ø±Ø§Û?Ù? "
-"Ø¯Û?Úº:https://bridges.torproject.org "
-"\n"
+"Ù¾Ù? Ú©Ù? ØØ§ØµÙ? Ú©Ø±Ù?Û? Ú©Ø§ Ø·Ø±Û?Ù?Û? Û?Û? Ø¨Ú¾Û? Û?Û? Ú©Û? Ù?Û?Ø¨ Ø¨Ø±Ø§Ø¤ Ø²Ø± Ù¾Ø± Û?Û? Û?Ù?Ø¢Ø±Ø§Û?Ù? Ø¯Û?Úº:https://";
+"bridges.torproject.org \n"
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "Ø§Û?Ù? Ù?Ù?Ù¹:Ú?Ù?Ù?Ú©Û? Û?Û? Ø§Û?Ú© Ø§Ù?Ú¯ Ø§Ù?Ú¯ Ù?Ø§Ø¦Ù? Ú©Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ú©Ø§ ØØµÛ? Û?Û?,ØªÙ?Ú¾Û?Úº Ø§Ù?ØªØ¸ Ø± Ú©Ø±Ù?Û? Ú©Û? "
 "Ø¶Ø±Ù?Ø±Øª Û?Û?Ø?ØªÙ?Ø§Ù? Ø§Ù?Ú¯ Ø§Ù?Ú¯ Ù?Ø§Ø¦Ù?Û?Úº Ø¬Ù? Ú©Û? Ù?Ù?ØµÙ?Ù? Û?Ù? Ú¯Û?Ø?Ø§Ù? Ø³Ø¨ Ú©Ù? Ø§Û?Ú© Ú?Ø§Ø±Û?Ú©Ù¹Ø±Û? Ù?Û?Úº Ú?Ø§Ù? "
-"Ø¯Û?ÚºØ§Ù?Ø± Ù?Ø§Ø¦Ù? Ú©Ù? Ø¯Ù?Ù?Ø±ØªØ¨Û? Ú©Ù?Ú© Ú©Ø± Ú©Û? Ú©Ú¾Ù?Ù? Ø¯Û?Úº "
-"\n"
+"Ø¯Û?ÚºØ§Ù?Ø± Ù?Ø§Ø¦Ù? Ú©Ù? Ø¯Ù?Ù?Ø±ØªØ¨Û? Ú©Ù?Ú© Ú©Ø± Ú©Û? Ú©Ú¾Ù?Ù? Ø¯Û?Úº \n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "Ù¾Û?Ú©Û?Ø¬ ØªØ±ØªÛ?Ø¨ Ø³Û? Û?Ù¹ Ø³Ú©ØªÛ? Û?Û?ÚºÛ?Ø§Ø³ Ø³Û? Ù¾Û?Ù?Û? Ú©Û?Ø§ Ø¢Ù¾ Ù¾Û?Ú©Û?Ø¬ Ú©Ú¾Ù?Ù?Û?Úº Ø¨Ø±Ø§Û? Ù?Û?Ø±Ø¨Ø§Ù?Û? Û?Ù?Û?Ù? "
-"Ú©Ø±Ù?Û?Úº Ú©Û? Ø¢Ù¾ Ù?Û? ØªÙ?Ø§Ù? Ù¾Û?Ú©Û?Ø¬ Ù?ØµÙ?Ù? Ú©Ø± Ù?Û?Û? Û?Û?Úº"
-"\n"
+"Ú©Ø±Ù?Û?Úº Ú©Û? Ø¢Ù¾ Ù?Û? ØªÙ?Ø§Ù? Ù¾Û?Ú©Û?Ø¬ Ù?ØµÙ?Ù? Ú©Ø± Ù?Û?Û? Û?Û?Úº\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Ø¢Ù¾ Ú©Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª Ú©Û? Ù?Ø¦Û? Ø¢Ù¾ Ú©Ø§ Ø´Ú©Ø±Û?Û?.Ø§Ø³Û? Ú©Ø§Ù?Û?Ø§Ø¨Û? Ø³Û? Ø³Ù?Ø¬Ú¾ Ù?Û?Ø§ Ú¯Û?Ø§ Û?Û?Ø¢Ù¾ Ú©Û? Ø¯Ø±Ø®Ù?Ø§Ø³Øª "
 "Ù¾Ø±Ø§Ø³ Ù?Ù?Øª Ø¹Ù?Ù?Ø¯Ø±Ø¢Ù?Ø¯ Ú©Û?Ø§ Ø¬Ø§ Ø±Û?Ø§ Û?Û?Ø¢Ù¾ Ú©Ø§ Ù¾Û?Ú©Ø¬ Ø§Ú¯Ù?Û? Ø¯Ø³ Ú©Û? Ø§Ù?Ø¯Ø± Ø§Ù?Ø¯Ø± Ù¾Û?Ù?Ú? Ø¬Ø§Ù?Ø§ "
-"Ú?Ø§Û?Ø¦Û?"
-"\n"
+"Ú?Ø§Û?Ø¦Û?\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
-"Ø¢Ú¯Ø± Û?Û? Ù?ØµÙ?Ù? Ù?Û?Û?Úº Û?Ù?Úº Ú¯Û?Ø? Ø¢Ù¾ Ú©Û? Ø§Û? Ù?Û?Ù? Ù?Ø±Ø§Û?Ù? Ú©Ø±Ù?Û? Ù?Ø§Ù?Û? Ú©Û? Ù?Û?Û? Û?Û? Ø¨Ú?Ø§ "
-"Û?Ù?Ú¯Ø§Û?gmail.com Û?Ø§ yahoo.cn Ø³Û? Û?Û? Ø§Û? Ù?Û?Ù? Ø¯Ù?Ø¨Ø§Ø±Ø§ Ø¨Û?Ú¾Ø¬Ù?Û? Ú©Û? Ú©Ù?Ø´Ø´ Ú©Ø±Ù?Û?Ø§Ø³ Ú©Û? "
-"Ø¹Ù?Ø§Ù?Û? tor-im-browser Ú©Û? Ø¨Ø¬Ø§Ø¦Û?tor-browser-bundle Ø§Ø³ØªØ¹Ù?Ø§Ù? Ú©Ø±Ù?Û? Ú©Û? Ú©Ù?Ø´Ø´ Ú©Ø±Ù? "
-"Ú©Û?Ù?Ù?Ú©Û? Û?Û? Ú?Ú¾Ù?Ù¹Û? Û?Û?."
-"\n"
+"Ø¢Ú¯Ø± Û?Û? Ù?ØµÙ?Ù? Ù?Û?Û?Úº Û?Ù?Úº Ú¯Û?Ø? Ø¢Ù¾ Ú©Û? Ø§Û? Ù?Û?Ù? Ù?Ø±Ø§Û?Ù? Ú©Ø±Ù?Û? Ù?Ø§Ù?Û? Ú©Û? Ù?Û?Û? Û?Û? Ø¨Ú?Ø§ Û?Ù?Ú¯Ø§Û?"
+"gmail.com Û?Ø§ yahoo.cn Ø³Û? Û?Û? Ø§Û? Ù?Û?Ù? Ø¯Ù?Ø¨Ø§Ø±Ø§ Ø¨Û?Ú¾Ø¬Ù?Û? Ú©Û? Ú©Ù?Ø´Ø´ Ú©Ø±Ù?Û?Ø§Ø³ Ú©Û? Ø¹Ù?Ø§Ù?Û? tor-"
+"im-browser Ú©Û? Ø¨Ø¬Ø§Ø¦Û?tor-browser-bundle Ø§Ø³ØªØ¹Ù?Ø§Ù? Ú©Ø±Ù?Û? Ú©Û? Ú©Ù?Ø´Ø´ Ú©Ø±Ù? Ú©Û?Ù?Ù?Ú©Û? Û?Û? "
+"Ú?Ú¾Ù?Ù¹Û? Û?Û?.\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
 "Ø¨Ø¯Ù?Ø³Ù?ØªÛ? Ø³Û? Û?Ù? Ø§Ø³ Ù?Ù?Øª Ù?Ø´Ú©Ù?Ø§Øª Ú©Ø§ Ø³Ø§Ù?Ù?Ø§ Ú©Ø± Ø±Û?Û? Û?Û?ÚºØ§Ù?Ø± Û?Ù? Ø¢Ù¾ Ú©Û? Ù?Ø±Ù?Ø§Ø¦Ø´ Ú©Û? ØªÚ©Ù?Û?Ù? "
 "Ø§Ø¨Ú¾Û? Ù?Û?Û?Úº Ú©Ø± Ø³Ú©ØªÛ? Û?Û?Úº.Ø¨Ø±Ø§Û? Ù?Û?Ø±Ø¨Ø§Ù?Û? ØµØ¨Ø± Ú©Ø±Û?Úº Û?Ù? Ø§Ø³ Ù?Ø³Ø¦Ù?Û? Ú©Ù? ØÙ? Ú©Ø±Ù?Û? Ú©Û? Ú©Ù?Ø´Ø´ "
-"Û?Û?Úº"
-"\n"
-"    "
+"Û?Û?Úº\n"
+"    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3) ex_Rename Ù?Ø§ Ø¦Ù? Ú©Ø§ Ù?Ø§Ù? ØªØ¨Ø¯Û?Ù? Ú©Ø± Ú©Û? exe. Ú©Ø±Ø¯Û?ÚºÛ?ex_RENAME.asc Ù?Ø§ Ø¦Ù? Ú©Ø§ "
+#~ "Ù?Ø§Ù? Ø¨Ú¾Û? ØªØ¨Ø¯Û?Ù? Ú©Ø± Ú©Û? exe.asc. Ú©Ø±Ø¯Û?Úº\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "ØªØ¹Ø§Ù?Ù?    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg ØªØµØ¯Û?Ù? <Ù¾Û?Ú©Û?Ø¬ Ú©Ø§ Ù?Ø§Ù?>.asc. <Ù¾Û?Ú©Û?Ø¬ Ú©Ø§ Ù?Ø§Ù?>\n"
+#~ "    "
diff --git a/i18n/ve/gettor.po b/i18n/ve/gettor.po
index e7e6736..a711308 100644
--- a/i18n/ve/gettor.po
+++ b/i18n/ve/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/vi/gettor.po b/i18n/vi/gettor.po
index c026d69..23e5098 100644
--- a/i18n/vi/gettor.po
+++ b/i18n/vi/gettor.po
@@ -6,135 +6,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-03-02 15:55+0100\n"
 "Last-Translator: Steve Wang <doctor.swan@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -145,273 +105,172 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:545
-msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:569
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:504
 msgid ""
-"\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:585
-msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    The output should look somewhat like this:\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."
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"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:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:525
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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."
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
-
-#: lib/gettor/constants.py:650
-msgid ""
 "\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
+"    Xin chÃ o báº¡n! Ä?Ã¢y lÃ  rÃ´-bÃ´ \"GetTor\".\n"
 "\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:657
-msgid ""
+"   CÃ¡m Æ¡n sá»± yÃªu cáº§u cá»§a báº¡n.\n"
 "\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
+"    KhÃ´ng may, hiá»?n chÃºng tÃ´i Ä?ang gáº·p trá»¥c tráº·c vÃ  khÃ´ng thá»? thá»?a máº£n yÃªu "
+"cáº§u cá»§a\n"
+"    báº¡n liá»?n ngay láºp tá»©c. Vui lÃ²ng kiÃªn nháº«n trong lÃºc chÃºng tÃ´i giáº£i quyáº¿t "
+"váº¥n Ä?á»? nÃ y.\n"
 "\n"
-"    "
-msgstr ""
+"        "
 
 #~ msgid ""
 #~ "\n"
@@ -422,10 +281,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -449,17 +310,18 @@ msgstr ""
 #~ "hÃ ng \n"
 #~ "    \"From\" tháºt sá»± lÃ  cÃ¡i Ä?Ã£ gá»i thÆ°l.\n"
 #~ "\n"
-#~ "    (ChÃºng tÃ´i xin lá»?i náº¿u báº¡n khÃ´ng cÃ³ há»?i cho thÆ° nÃ y. VÃ¬ thÆ° Ä?Ã¬á»?n tá» cá»§a "
-#~ "báº¡n Ä?áº¿n tá»«\n"
+#~ "    (ChÃºng tÃ´i xin lá»?i náº¿u báº¡n khÃ´ng cÃ³ há»?i cho thÆ° nÃ y. VÃ¬ thÆ° Ä?Ã¬á»?n tá» "
+#~ "cá»§a báº¡n Ä?áº¿n tá»«\n"
 #~ "    má»?t dá»?ch vá»¥ khÃ´ng dÃ¹ng DKIM, chÃºng tÃ´i gá»i má»?t giáº£i thÃch ngáº¯n gá»?n,\n"
-#~ "    vÃ  rá»?i chÃºng tÃ´i sáº½ bá»? qua Ä?á»?a chá»? thÆ° Ä?iá»?n tá» nÃ y trong vÃ i ngÃ y tá»?i.)\n"
+#~ "    vÃ  rá»?i chÃºng tÃ´i sáº½ bá»? qua Ä?á»?a chá»? thÆ° Ä?iá»?n tá» nÃ y trong vÃ i ngÃ y "
+#~ "tá»?i.)\n"
 #~ "\n"
-#~ "    Vui lÃ²ng lÆ°u Ã½ ráº±ng chÃºng tÃ´i khÃ´ng thá»? xá» lÃ½ thÆ° Ä?iá»?n tá» dáº¡ng HTML hoáº·c "
-#~ "cÆ¡ sá»? 64.\n"
+#~ "    Vui lÃ²ng lÆ°u Ã½ ráº±ng chÃºng tÃ´i khÃ´ng thá»? xá» lÃ½ thÆ° Ä?iá»?n tá» dáº¡ng HTML "
+#~ "hoáº·c cÆ¡ sá»? 64.\n"
 #~ "    Báº¡n cáº§n gá»i vÄ?n báº£n chuáº©n.\n"
 #~ "\n"
-#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c vá»?i "
-#~ "má»?t\n"
+#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c "
+#~ "vá»?i má»?t\n"
 #~ "    nhÃ¢n viÃªn táº¡i Ä?á»?a chá»? thÆ° Ä?iá»?n tá» há»? trá»£ nÃ y: tor-"
 #~ "assistants@xxxxxxxxxxxxxx\n"
 #~ "     "
@@ -532,7 +394,8 @@ msgstr ""
 #~ "        tor-im-browser-bundle\n"
 #~ "        source-bundle\n"
 #~ "\n"
-#~ "    Vui lÃ²ng tráº£ lá»?i thÆ° nÃ y (Ä?áº¿n gettor@xxxxxxxxxxxxxx), vÃ  cho tÃ´i biáº¿t\n"
+#~ "    Vui lÃ²ng tráº£ lá»?i thÆ° nÃ y (Ä?áº¿n gettor@xxxxxxxxxxxxxx), vÃ  cho tÃ´i "
+#~ "biáº¿t\n"
 #~ "    tÃªn má»?t gÃ³i báº¥t cá»© chá»? nÃ o trong pháº§n thÃ¢n cá»§a thÆ° Ä?iá»?n tá» cá»§a báº¡n.\n"
 #~ "\n"
 #~ "    Láº¤Y PHIÃ?N Báº¢N Ä?á»?A PHÆ¯Æ NG Cá»¦A TOR\n"
@@ -544,7 +407,8 @@ msgstr ""
 #~ "\n"
 #~ "        gettor+zh@xxxxxxxxxxxxxx\n"
 #~ "\n"
-#~ "    ThÃ dá»¥ nÃ y sáº½ cho báº¡n cÃ¡i gÃ³i Ä?Ã£ Ä?Æ°á»£c Ä?á»?a phÆ°Æ¡ng hÃ³a sang tiáº¿ng Trung mÃ \n"
+#~ "    ThÃ dá»¥ nÃ y sáº½ cho báº¡n cÃ¡i gÃ³i Ä?Ã£ Ä?Æ°á»£c Ä?á»?a phÆ°Æ¡ng hÃ³a sang tiáº¿ng Trung "
+#~ "mÃ \n"
 #~ "    báº¡n yÃªu cáº§u. Xem danh sÃ¡ch nhá»¯ng mÃ£ ngÃ´n ngá»¯ Ä?Æ°á»£c há»? trá»£ bÃªn dÆ°á»?i.\n"
 #~ "\n"
 #~ "    Danh sÃ¡ch nhá»¯ng miá»?n Ä?á»?a phÆ°Æ¡ng Ä?Æ°á»£c há»? trá»£:\n"
@@ -564,13 +428,14 @@ msgstr ""
 #~ "    gettor+ru@xxxxxxxxxxxxxx:     Tiáº¿ng Nga\n"
 #~ "    gettor+zh@xxxxxxxxxxxxxx:     Tiáº¿ng Trung\n"
 #~ "\n"
-#~ "    Náº¿u báº¡n khÃ´ng chá»?n ngÃ´n ngá»¯ nÃ o, báº¡n sáº½ nháºn Ä?Æ°á»£c phiÃªn báº£n tiáº¿ng Anh.\n"
+#~ "    Náº¿u báº¡n khÃ´ng chá»?n ngÃ´n ngá»¯ nÃ o, báº¡n sáº½ nháºn Ä?Æ°á»£c phiÃªn báº£n tiáº¿ng "
+#~ "Anh.\n"
 #~ "\n"
 #~ "    Há»? TRá»¢\n"
 #~ "    =====\n"
 #~ "\n"
-#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c vá»?i "
-#~ "má»?t\n"
+#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c "
+#~ "vá»?i má»?t\n"
 #~ "    nhÃ¢n viÃªn táº¡i Ä?á»?a chá»? thÆ° Ä?iá»?n tá» há»? trá»£ nÃ y: tor-"
 #~ "assistants@xxxxxxxxxxxxxx\n"
 #~ "\n"
@@ -604,8 +469,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -641,21 +506,23 @@ msgstr ""
 #~ "    Náº¿u káº¿t ná»?i Internet cá»§a báº¡n cháºn sá»± truy cáºp Ä?áº¿n máº¡ng cá»§a Tor, báº¡n\n"
 #~ "    cÃ³ thá»? cáº§n má»?t chiáº¿c cáº§u tiáº¿p ná»?i. Nhá»¯ng cáº§u tiáº¿p ná»?i (hay nÃ³i táº¯t lÃ  "
 #~ "\"cáº§u\")\n"
-#~ "    lÃ  nhá»¯ng tiáº¿p ná»?i cá»§a Tor khÃ´ng cÃ³ liá»?t kÃª trong thÆ° má»¥c chÃnh. VÃ¬ khÃ´ng\n"
+#~ "    lÃ  nhá»¯ng tiáº¿p ná»?i cá»§a Tor khÃ´ng cÃ³ liá»?t kÃª trong thÆ° má»¥c chÃnh. VÃ¬ "
+#~ "khÃ´ng\n"
 #~ "    cÃ³ danh sÃ¡ch cÃ´ng nÃ o cá»§a chÃºng, ngay cáº£ náº¿u nhÆ° ISP cá»§a báº¡n cÃ³ lá»?c\n"
-#~ "    nhá»¯ng káº¿t ná»?i Ä?áº¿n táº¥t cáº£ nhá»¯ng tiáº¿p ná»?i biáº¿t Ä?Æ°á»?c cá»§a Tor, há»? cháº¯c cÅ©ng\n"
+#~ "    nhá»¯ng káº¿t ná»?i Ä?áº¿n táº¥t cáº£ nhá»¯ng tiáº¿p ná»?i biáº¿t Ä?Æ°á»?c cá»§a Tor, há»? cháº¯c "
+#~ "cÅ©ng\n"
 #~ "    khÃ´ng thá»? nÃ o cháºn háº¿t táº¥t cáº£ nhá»¯ng chiáº¿c cáº§u.\n"
 #~ "\n"
-#~ "    Báº¡n cÃ³ thá»? láº¥y Ä?Æ°á»£c má»?t chiáº¿c cáº§u báº±ng cÃ¡ch gá»i má»?t thÆ° Ä?Ã¬á»?n tá» chá»©a chá»¯ "
-#~ "\"get bridges\"\n"
+#~ "    Báº¡n cÃ³ thá»? láº¥y Ä?Æ°á»£c má»?t chiáº¿c cáº§u báº±ng cÃ¡ch gá»i má»?t thÆ° Ä?Ã¬á»?n tá» chá»©a "
+#~ "chá»¯ \"get bridges\"\n"
 #~ "    trong pháº§n thÃ¢n cá»§a thÆ° Ä?iá»?n tá» Ä?áº¿n Ä?á»?a chá»? thÆ° Ä?Ã¬á»?n tá» sau Ä?Ã¢y:\n"
 #~ "    bridges@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "    Báº¡n cÅ©ng cÃ³ thá»? láº¥y nhá»¯ng chiáº¿c cáº§u vá»?i má»?t trÃ¬nh duyá»?t web táº¡i url\n"
 #~ "    sau Ä?Ã¢y: https://bridges.torproject.org/\n";
 #~ "\n"
-#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c vá»?i "
-#~ "má»?t\n"
+#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c "
+#~ "vá»?i má»?t\n"
 #~ "    nhÃ¢n viÃªn táº¡i Ä?á»?a chá»? thÆ° Ä?iá»?n tá» há»? trá»£ nÃ y: tor-"
 #~ "assistants@xxxxxxxxxxxxxx\n"
 #~ "        "
@@ -697,8 +564,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -743,21 +610,23 @@ msgstr ""
 #~ "    Náº¿u káº¿t ná»?i Internet cá»§a báº¡n cháºn sá»± truy cáºp Ä?áº¿n máº¡ng cá»§a Tor, báº¡n\n"
 #~ "    cÃ³ thá»? cáº§n má»?t chiáº¿c cáº§u tiáº¿p ná»?i. Nhá»¯ng cáº§u tiáº¿p ná»?i (hay nÃ³i táº¯t lÃ  "
 #~ "\"cáº§u\")\n"
-#~ "    lÃ  nhá»¯ng tiáº¿p ná»?i cá»§a Tor khÃ´ng cÃ³ liá»?t kÃª trong thÆ° má»¥c chÃnh. VÃ¬ khÃ´ng\n"
+#~ "    lÃ  nhá»¯ng tiáº¿p ná»?i cá»§a Tor khÃ´ng cÃ³ liá»?t kÃª trong thÆ° má»¥c chÃnh. VÃ¬ "
+#~ "khÃ´ng\n"
 #~ "    cÃ³ danh sÃ¡ch cÃ´ng nÃ o cá»§a chÃºng, ngay cáº£ náº¿u nhÆ° ISP cá»§a báº¡n cÃ³ lá»?c\n"
-#~ "    nhá»¯ng káº¿t ná»?i Ä?áº¿n táº¥t cáº£ nhá»¯ng tiáº¿p ná»?i biáº¿t Ä?Æ°á»?c cá»§a Tor, há»? cháº¯c cÅ©ng\n"
+#~ "    nhá»¯ng káº¿t ná»?i Ä?áº¿n táº¥t cáº£ nhá»¯ng tiáº¿p ná»?i biáº¿t Ä?Æ°á»?c cá»§a Tor, há»? cháº¯c "
+#~ "cÅ©ng\n"
 #~ "    khÃ´ng thá»? nÃ o cháºn háº¿t táº¥t cáº£ nhá»¯ng chiáº¿c cáº§u.\n"
 #~ "\n"
-#~ "    Báº¡n cÃ³ thá»? láº¥y Ä?Æ°á»£c má»?t chiáº¿c cáº§u báº±ng cÃ¡ch gá»i má»?t thÆ° Ä?Ã¬á»?n tá» chá»©a chá»¯ "
-#~ "\"get bridges\"\n"
+#~ "    Báº¡n cÃ³ thá»? láº¥y Ä?Æ°á»£c má»?t chiáº¿c cáº§u báº±ng cÃ¡ch gá»i má»?t thÆ° Ä?Ã¬á»?n tá» chá»©a "
+#~ "chá»¯ \"get bridges\"\n"
 #~ "    trong pháº§n thÃ¢n cá»§a thÆ° Ä?iá»?n tá» Ä?áº¿n Ä?á»?a chá»? thÆ° Ä?Ã¬á»?n tá» sau Ä?Ã¢y:\n"
 #~ "    bridges@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "    Báº¡n cÅ©ng cÃ³ thá»? láº¥y nhá»¯ng chiáº¿c cáº§u vá»?i má»?t trÃ¬nh duyá»?t web táº¡i url\n"
 #~ "    sau Ä?Ã¢y: https://bridges.torproject.org/\n";
 #~ "\n"
-#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c vá»?i "
-#~ "má»?t\n"
+#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c "
+#~ "vá»?i má»?t\n"
 #~ "    nhÃ¢n viÃªn táº¡i Ä?á»?a chá»? thÆ° Ä?iá»?n tá» há»? trá»£ nÃ y: tor-"
 #~ "assistants@xxxxxxxxxxxxxx\n"
 #~ "\n"
@@ -767,8 +636,8 @@ msgstr ""
 #~ "\n"
 #~ "    Hello, This is the \"GetTor\" robot.\n"
 #~ "\n"
-#~ "    Thank you for your request. It was successfully understood. Your request "
-#~ "is\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"
@@ -787,44 +656,21 @@ msgstr ""
 #~ "\n"
 #~ "    Xin chÃ o báº¡n! Ä?Ã¢y lÃ  rÃ´-bÃ´ \"GetTor\".\n"
 #~ "\n"
-#~ "    CÃ¡m Æ¡n sá»± yÃªu cáº§u cá»§a báº¡n. YÃªu cáº§u Ä?Ã£ Ä?Æ°á»£c hiá»?u hoÃ n toÃ n. YÃªu cáº§u cá»§a "
-#~ "báº¡n\n"
-#~ "    hiá»?n Ä?ang Ä?Æ°á»£c xá» lÃ½. GÃ³i cá»§a báº¡n sáº½ Ä?áº¿n trong vÃ²ng mÆ°á»?i phÃºt sáº¯p tá»?i.\n"
+#~ "    CÃ¡m Æ¡n sá»± yÃªu cáº§u cá»§a báº¡n. YÃªu cáº§u Ä?Ã£ Ä?Æ°á»£c hiá»?u hoÃ n toÃ n. YÃªu cáº§u "
+#~ "cá»§a báº¡n\n"
+#~ "    hiá»?n Ä?ang Ä?Æ°á»£c xá» lÃ½. GÃ³i cá»§a báº¡n sáº½ Ä?áº¿n trong vÃ²ng mÆ°á»?i phÃºt sáº¯p "
+#~ "tá»?i.\n"
 #~ "\n"
 #~ "    Náº¿u khÃ´ng Ä?áº¿n Ä?Æ°á»£c thÃ¬ cÃ³ láº½ cÃ¡i gÃ³i quÃ¡ lá»?n cho nhÃ  cung cáº¥p thÆ° cá»§a "
 #~ "báº¡n.\n"
-#~ "    Thá» gá»i thÆ° láº¡i tá»« má»?t tÃ i khoáº£n cá»§a gmail.com hay yahoo.cn. Báº¡n cÅ©ng\n"
+#~ "    Thá» gá»i thÆ° láº¡i tá»« má»?t tÃ i khoáº£n cá»§a gmail.com hay yahoo.cn. Báº¡n "
+#~ "cÅ©ng\n"
 #~ "    thá» há»?i cho tor-browser-bundle hÆ¡n lÃ  tor-im-browser-bundle\n"
 #~ "    vÃ¬ nÃ³ nhá»? hÆ¡n.\n"
 #~ "\n"
-#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c vá»?i "
-#~ "má»?t\n"
+#~ "    Náº¿u báº¡n cÃ³ cÃ¢u há»?i nÃ o hoáº·c khÃ´ng lÃ m Ä?Æ°á»£c gÃ¬, báº¡n cÃ³ thá»? liÃªn láº¡c "
+#~ "vá»?i má»?t\n"
 #~ "    nhÃ¢n viÃªn táº¡i Ä?á»?a chá»? thÆ° Ä?iá»?n tá» há»? trá»£ nÃ y: tor-"
 #~ "assistants@xxxxxxxxxxxxxx\n"
 #~ "\n"
 #~ "        "
-
-#~ msgid ""
-#~ "\n"
-#~ "    Hello, This is the \"GetTor\" robot.\n"
-#~ "\n"
-#~ "    Thank you for your request.\n"
-#~ "\n"
-#~ "    Unfortunately we are currently experiencing problems and we can't "
-#~ "fulfill\n"
-#~ "    your request right now. Please be patient as we try to resolve this "
-#~ "issue.\n"
-#~ "\n"
-#~ "        "
-#~ msgstr ""
-#~ "\n"
-#~ "    Xin chÃ o báº¡n! Ä?Ã¢y lÃ  rÃ´-bÃ´ \"GetTor\".\n"
-#~ "\n"
-#~ "   CÃ¡m Æ¡n sá»± yÃªu cáº§u cá»§a báº¡n.\n"
-#~ "\n"
-#~ "    KhÃ´ng may, hiá»?n chÃºng tÃ´i Ä?ang gáº·p trá»¥c tráº·c vÃ  khÃ´ng thá»? thá»?a máº£n yÃªu "
-#~ "cáº§u cá»§a\n"
-#~ "    báº¡n liá»?n ngay láºp tá»©c. Vui lÃ²ng kiÃªn nháº«n trong lÃºc chÃºng tÃ´i giáº£i quyáº¿t "
-#~ "váº¥n Ä?á»? nÃ y.\n"
-#~ "\n"
-#~ "        "
diff --git a/i18n/wa/gettor.po b/i18n/wa/gettor.po
index e7e6736..a711308 100644
--- a/i18n/wa/gettor.po
+++ b/i18n/wa/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/wo/gettor.po b/i18n/wo/gettor.po
index e7e6736..a711308 100644
--- a/i18n/wo/gettor.po
+++ b/i18n/wo/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/zh_CN/gettor.po b/i18n/zh_CN/gettor.po
index 7631b7f..ca85024 100644
--- a/i18n/zh_CN/gettor.po
+++ b/i18n/zh_CN/gettor.po
@@ -6,23 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: 2010-04-16 04:24-0600\n"
 "Last-Translator: Wu Haotian <wuhaotian108@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
+#, fuzzy
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 "\n"
 "    æ?¨å¥½ï¼?æ??æ?¯\"GetTor\"è?ªå?¨å??å¤?æ?ºå?¨äººã??\n"
@@ -31,14 +30,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 "\n"
 "    å¾?æ?±æ?ï¼?æ??ä»¬ä¸?è?½ç?å¤?æ¤ç?µé?®å?°å??ã??\n"
@@ -46,14 +43,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
+#, fuzzy
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 "\n"
 "    æ??ä»¬ä»?å¤?ç??æ?¥è?ªæ?¯æ??\"DKIM\"ç??ç?µé?®æ??å?¡ç??é?®ä»¶ï¼?\n"
@@ -61,14 +56,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
+#, fuzzy
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 "\n"
 "    ï¼?è?¥æ?¨ä¸?æ?¾å??é?®ä»¶å?¨è¯¢ï¼?æ??ä»¬æ·±è¡¨æ?æ??ã??\n"
@@ -77,13 +70,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
+#, fuzzy
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 "\n"
 "    è¯·æ³¨æ??ï¼?ç?®å??æ??ä»¬å°?ä¸?è?½å¤?ç?? HTML æ?? base 64 æ ¼å¼?ç??é?®ä»¶ã??\n"
@@ -91,13 +82,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
+#, fuzzy
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 "\n"
 "    è?¥æ?¨æ??ç??é?®æ??è½¯ä»¶ä¸?å·¥ä½?ï¼?è¯·è??ç³»å®¢æ??äººå??ï¼?\n"
@@ -105,13 +94,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 "\n"
 "    è?¥æ?¨å??è¯?æ??é??è¦?å?ªä»½ Tor è½¯ä»¶å??ï¼?æ??ä¼?å??ç»?æ?¨ã??\n"
@@ -119,13 +106,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
+#, fuzzy
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    è¯·å??å¤?æ¤é?®ä»¶ï¼?å?° gettor@xxxxxxxxxxxxxxï¼?ï¼?\n"
@@ -133,23 +118,19 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+#, fuzzy
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 "\n"
 "    è?·å??TORç??æ?¬å?°å??ç??æ?¬\n"
 "    "
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
+#, fuzzy
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 "\n"
 "    å?¨æ?¶ä»¶äººå?°å??ä¸æ??å®?æ?¨æ??é??ç??è¯è¨?ä»£ç ?ï¼?\n"
@@ -157,14 +138,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
+#, fuzzy
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 "\n"
 "    æ?¬ä¾?ä¸å°?ä¼?ç»?æ?¨æ??è¯·æ±?ç??ä¸æ??æ?¬å?°å??å??ã??\n"
@@ -172,31 +151,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+#, fuzzy
+msgid " List of supported locales:"
 msgstr ""
 "\n"
 "    æ?¯æ??è¯è¨?ç?¯å¢?å??è¡¨ï¼?\n"
 "    "
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+#, fuzzy
+msgid "Here is a list of all available languages:"
 msgstr ""
 "\n"
 "    ä»¥ä¸?æ?¯å?¨é?¨å?¯ç?¨è¯è¨?å??è¡¨:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
+#, fuzzy
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -207,9 +181,7 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     é?¿æ??ä¼¯è¯\n"
@@ -226,361 +198,308 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+#, fuzzy
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 "\n"
 "    è?¥æ?¨æ?ªæ??å®?è¯è¨?ï¼?æ?¨å°?ä¼?æ?¶å?°è?±æ??ç??ã??\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+#, fuzzy
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 "\n"
 "è¾?å°?ç??æ??ä»¶å??\n"
 "    "
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
+#, fuzzy
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 "\n"
-"å¦?æ??æ?¨ç??å¸¦å®½ä½?æ??è??ä½ ç??æ??ä¾?å??ä¸?å??è®¸æ?¨æ?¥å??ç?µå?é?®ä»¶é??ç??å¤§ç??é??ä»¶ï¼?GetToræ??ä¸?ä¸ªç?¹ç?¹æ?¯æ?¨å?¯ä»¥ä½¿å®?å??æ?¨å??é??ä¸?ç»?å°?ç??æ?°æ?®å??è??ä¸?æ?¯ä¸?ä¸ªå¤§ç??æ?°æ?®å??ã??\n"
+"å¦?æ??æ?¨ç??å¸¦å®½ä½?æ??è??ä½ ç??æ??ä¾?å??ä¸?å??è®¸æ?¨æ?¥å??ç?µå?é?®ä»¶é??ç??å¤§ç??é??ä»¶ï¼?GetToræ??ä¸?ä¸ªç?¹"
+"ç?¹æ?¯æ?¨å?¯ä»¥ä½¿å®?å??æ?¨å??é??ä¸?ç»?å°?ç??æ?°æ?®å??è??ä¸?æ?¯ä¸?ä¸ªå¤§ç??æ?°æ?®å??ã??\n"
 "    "
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
+#: lib/gettor/i18n.py:468
+#, fuzzy
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 "\n"
 "å?ªé??å??è¿?æ ·å?¨æ?¨ç??ç?µå?é?®ä»¶ä¸å??å?«â??split\"å?³é?®å?ï¼?\n"
 "    "
 
-#: lib/gettor/constants.py:515
+#: lib/gettor/i18n.py:470
+#, fuzzy
 msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 "\n"
-"å??GetTorå??é??å?«è¿?ä¸ªæ??æ?¬ç??ç?µå?é?®ä»¶ä¼?ä½¿å®?å??æ?¨ä»¥ä¸?ç»?1.4MBå¤§å°?ç??é??ä»¶ç??å½¢å¼?å??é??Tor Browser Bundleã??\n"
+"å??GetTorå??é??å?«è¿?ä¸ªæ??æ?¬ç??ç?µå?é?®ä»¶ä¼?ä½¿å®?å??æ?¨ä»¥ä¸?ç»?1.4MBå¤§å°?ç??é??ä»¶ç??å½¢å¼?å??é??Tor "
+"Browser Bundleã??\n"
 "    "
 
-#: lib/gettor/constants.py:520
+#: lib/gettor/i18n.py:473
+#, fuzzy
 msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 "\n"
 "å?¨æ?¥å??å?¨é?¨ç??é?¨å??å??ï¼?æ?¨é??è¦?æ??ä»?ä»¬é??æ?°ç»?è£?æ??ä¸?ä¸ªæ??ä»¶å??ã??æ¥éª¤å¦?ä¸?ï¼?\n"
 "    "
 
-#: lib/gettor/constants.py:525
-msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:476
+#, fuzzy
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 "\n"
 "1.)å°?æ??æ??æ?¥å??å?°ç??é??ä»¶ä¿?å?å?¨æ?¨ç??ç¡¬ç??ç??å??ä¸?ä¸ªæ??ä»¶å¤¹é??ã??\n"
 "    "
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:478
+#, fuzzy
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 "\n"
-"2.)å°?æ??æ??å??ç¼?å??ä¸ºâ??.z\"ç??æ??ä»¶è§£å??ã??å¦?æ??æ?¨ä¹?å??å°?æ??æ??ç??é??ä»¶ä¿?å?å?¨ä¸?ä¸ªæ?°ç??æ??ä»¶å¤¹ï¼?ä»?å?¨é?£ä¸ªæ??ä»¶å¤¹é??è§£å??æ??æ??æ??ä»¶å°±å?¯ä»¥ã??\n"
+"2.)å°?æ??æ??å??ç¼?å??ä¸ºâ??.z\"ç??æ??ä»¶è§£å??ã??å¦?æ??æ?¨ä¹?å??å°?æ??æ??ç??é??ä»¶ä¿?å?å?¨ä¸?ä¸ªæ?°ç??æ??ä»¶"
+"å¤¹ï¼?ä»?å?¨é?£ä¸ªæ??ä»¶å¤¹é??è§£å??æ??æ??æ??ä»¶å°±å?¯ä»¥ã??\n"
 "    "
 
-#: lib/gettor/constants.py:534
+#: lib/gettor/i18n.py:481
+#, fuzzy
 msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"3.)å°?å??ç¼?å??ä¸ºâ??.ex_RENAME\"ç??æ??ä»¶æ?¹æ??ä»¥â??.exeâ??ä¸ºå??ç¼?ç??æ??ä»¶ï¼?å°?å??ç¼?å??ä¸º \".ex_RENAME.asc\" "
-"ç??æ??ä»¶æ?¹æ??ä»¥\".exe.asc\"ä¸ºå??ç¼?å??ã??"
-
-#: lib/gettor/constants.py:540
-msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 "\n"
 "æ ¸å®?æ?¨æ?¥å??ç??æ??æ??ç??è¯¥é?®ä»¶ä¸æ??è¿°ç??æ¯?ä¸ªæ??ä»¶å??\n"
 "    "
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:484
+#, fuzzy
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 "\n"
-"ç?°å?¨ç?¨ä¸?ä¸ªè?½è§£å??å¤?ä¸ªå?·RARæ ¼å¼?ç??ç¨?åº?ã??å?¨Windowsç?¯å¢?ä¸é??å¸¸æ?¯WinRARã??å¦?æ??æ?¨æ²¡æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?è¯¥è½¯ä»¶ï¼?è¯·å?¨è¿?é??å¾?å?°å®?ï¼?\n"
+"ç?°å?¨ç?¨ä¸?ä¸ªè?½è§£å??å¤?ä¸ªå?·RARæ ¼å¼?ç??ç¨?åº?ã??å?¨Windowsç?¯å¢?ä¸é??å¸¸æ?¯WinRARã??å¦?æ??æ?¨æ²¡æ??"
+"å?¨æ?¨ç??ç?µè??ä¸?å®?è£?è¯¥è½¯ä»¶ï¼?è¯·å?¨è¿?é??å¾?å?°å®?ï¼?\n"
 "    "
 
-#: lib/gettor/constants.py:555
-msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+#, fuzzy
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 "\n"
 "è¦?è§£å??æ?¨ç??Toræ??ä»¶å??ï¼?å?ªé??å??å?»â??.exe\"æ??ä»¶ã??\n"
 "    "
 
-#: lib/gettor/constants.py:559
+#: lib/gettor/i18n.py:490
+#, fuzzy
 msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 "\n"
-"è§£å??ç¼©ç»?æ??å??ï¼?æ?¨åº?è¯¥ä¼?å?¨æ?¨ç??ç?®æ ?æ??ä»¶å¤¹ä¸æ?¾å?°æ?°å??å»ºç??â??.exe\"æ??ä»¶ã??å?ªé??å??å?»å®?ï¼?Tor Browser Bundleä¼?å?¨å? ç§?é??å??è¿?è¡?ã??\n"
+"è§£å??ç¼©ç»?æ??å??ï¼?æ?¨åº?è¯¥ä¼?å?¨æ?¨ç??ç?®æ ?æ??ä»¶å¤¹ä¸æ?¾å?°æ?°å??å»ºç??â??.exe\"æ??ä»¶ã??å?ªé??å??å?»å®?ï¼?"
+"Tor Browser Bundleä¼?å?¨å? ç§?é??å??è¿?è¡?ã??\n"
 "    "
 
-#: lib/gettor/constants.py:565
-msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+#: lib/gettor/i18n.py:494
+#, fuzzy
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 "\n"
 "å°±æ?¯è¿?æ ·ã??è¿?ç¨?å®?æ??ã??æ??è°¢æ?¨ä½¿ç?¨Torå¹¶ç¥?æ?¨æ??å¿«ï¼?\n"
 "    "
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
-"\n"
-"æ?¯æ??\n"
-"    "
 
-#: lib/gettor/constants.py:580
+#: lib/gettor/i18n.py:501
+#, fuzzy
 msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 "\n"
 "è¿?æ?¯æ?¨è¯·æ±?ç??è½¯ä»¶ç??zipæ ¼å¼?æ??ä»¶ã??è¯·è§£å??æ??ä»¶å¹¶éª?è¯?ç¾å??ã??\n"
 "    "
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:504
+#, fuzzy
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 "\n"
 "æ??ç¤ºï¼?å¦?æ??æ?¨ç??ç?µè??å·²å®?è£?è¿?GnuPG,å?¨è§£å??æ??ä»¶å??è¯·å¦?ä¸?ä½¿ç?¨gpgå?½ä»¤æ ?å·¥å?·ï¼?\n"
 "    "
 
-#: lib/gettor/constants.py:590
-msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"gpg --éª?è¯? <packagename>.asc <packagename>\n"
-"\n"
-"    "
-
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+#, fuzzy
+msgid "The output should look somewhat like this:"
 msgstr ""
 "\n"
 "è¾?å?ºç»?æ??åº?è¯¥ç±»ä¼¼è¿?æ ·:\n"
 "\n"
 "    "
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
+#, fuzzy
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 "\n"
 "å¦?æ??æ?¨å¯¹å?½ä»¤æ ?å·¥å?·ä¸?äº?è§£ï¼?è¯·å?¨è¿?ä¸ªç½?ç«?ä¸?è¯?ç??å¯»æ?¾GnuPGé??ç?¨ç??ç?¨æ?·å?¾å½¢ç??é?¢ï¼?\n"
 "    "
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
+#, fuzzy
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 "\n"
-"å¦?æ??æ?¨ç??Interneté?¾æ?¥é?»æ¢æ?¨é?¾æ?¥Torç½?ç»?ï¼?æ?¨å?¯è?½é??è¦?ä¸?ä¸ªæ¡¥æ?¥ã??æ¡¥æ?¥ï¼?æ??è??ç®?ç§°â??æ¡¥â??ï¼?æ?¯Toræ²¡æ??å?¨ä¸»ç?®å½?ä¸å??å?ºç??Torç½?ç»?ä¸ç»§ã??å? ä¸ºæ²¡æ??ä¸ç»§ç??å®?"
-"æ?´ç??å?¬å¼?å??è¡¨ï¼?å?³ä½¿æ?¨ç??ISPè¿?æ»¤äº?æ??æ??é??å??å·²ç?¥Torä¸ç»§ç??é?¾æ?¥ï¼?å®?ä»¬å?¯è?½ä¸?ä¼?å±?è?½æ??æ??ç??æ¡¥æ?¥ã??\n"
+"å¦?æ??æ?¨ç??Interneté?¾æ?¥é?»æ¢æ?¨é?¾æ?¥Torç½?ç»?ï¼?æ?¨å?¯è?½é??è¦?ä¸?ä¸ªæ¡¥æ?¥ã??æ¡¥æ?¥ï¼?æ??è??ç®?"
+"ç§°â??æ¡¥â??ï¼?æ?¯Toræ²¡æ??å?¨ä¸»ç?®å½?ä¸å??å?ºç??Torç½?ç»?ä¸ç»§ã??å? ä¸ºæ²¡æ??ä¸ç»§ç??å®?æ?´ç??å?¬å¼?å??è¡¨ï¼?"
+"å?³ä½¿æ?¨ç??ISPè¿?æ»¤äº?æ??æ??é??å??å·²ç?¥Torä¸ç»§ç??é?¾æ?¥ï¼?å®?ä»¬å?¯è?½ä¸?ä¼?å±?è?½æ??æ??ç??æ¡¥æ?¥ã??\n"
 "    "
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
+#, fuzzy
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 "\n"
-"ä½ å?¯ä»¥å??è¿?ä¸ªå?°å??ï¼?bridges@xxxxxxxxxxxxxxå??é??ç?µå?é?®ä»¶ä»¥è?·å??ä¸?ä¸ªæ¡¥æ?¥ï¼?é??è¦?å?¨æ£æ??ä¸å??å?«\"get bridges\"ã??\n"
+"ä½ å?¯ä»¥å??è¿?ä¸ªå?°å??ï¼?bridges@xxxxxxxxxxxxxxå??é??ç?µå?é?®ä»¶ä»¥è?·å??ä¸?ä¸ªæ¡¥æ?¥ï¼?é??è¦?å?¨æ£"
+"æ??ä¸å??å?«\"get bridges\"ã??\n"
 "    "
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
+#, fuzzy
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 "\n"
 "æ?¨ä¹?å?¯ä»¥é??è¿?æµ?è§?å?¨å?¨ä»¥ä¸?ç½?å??å¾?å?°æ¡¥æ?¥ï¼?https://bridges.torproject.org/\n";
 "    "
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 "\n"
 "é??è¦?æ??ç¤ºï¼?\n"
-"å? ä¸ºè¿?æ?¯å??å?·å??é??ç??è¯·æ±?ï¼?æ?¨é??è¦?ç?å¾?æ??æ??ç??é?¨å??æ?¥å??å?°å??ï¼?ç?¶å??æ??å®?ä»¬ä¿?å?å?°å??ä¸?ä¸ªæ??ä»¶å¤¹ï¼?æ?¥ç??å??å?»ç¬¬ä¸?ä¸ªæ??ä»¶è§£å??ã??\n"
+"å? ä¸ºè¿?æ?¯å??å?·å??é??ç??è¯·æ±?ï¼?æ?¨é??è¦?ç?å¾?æ??æ??ç??é?¨å??æ?¥å??å?°å??ï¼?ç?¶å??æ??å®?ä»¬ä¿?å?å?°å??ä¸?ä¸ª"
+"æ??ä»¶å¤¹ï¼?æ?¥ç??å??å?»ç¬¬ä¸?ä¸ªæ??ä»¶è§£å??ã??\n"
 "    "
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
+#, fuzzy
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 "\n"
 "æ??ä»¶å??å?¯è?½ä¸?æ?¯æ??é¡ºåº?æ?¥å??å?°ï¼?è¯·æ?¨ç¡®è®¤æ?¥å??å?°æ??æ??ç??æ??ä»¶å??å??å?¨å°?è¯?è§£å??ä»?ä»¬ï¼?\n"
 "    "
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
+#, fuzzy
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 "\n"
-"æ??è°¢æ?¨ç??è¯·æ±?ã??æ??ä»¬å·²ç»?æ??å??ç??è§£ã??æ?¨ç??è¯·æ±?æ£å?¨è¢«å¤?ç??ä¸ã??æ?¨ç??æ??ä»¶å??åº?è¯¥å?¨æ?¥ä¸?æ?¥ç??å??å??é??å??ä¼ è¾¾ã??\n"
+"æ??è°¢æ?¨ç??è¯·æ±?ã??æ??ä»¬å·²ç»?æ??å??ç??è§£ã??æ?¨ç??è¯·æ±?æ£å?¨è¢«å¤?ç??ä¸ã??æ?¨ç??æ??ä»¶å??åº?è¯¥å?¨æ?¥ä¸?æ?¥"
+"ç??å??å??é??å??ä¼ è¾¾ã??\n"
 "    "
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
+#, fuzzy
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 "\n"
-"å¦?æ??æ??ä»¶å??æ²¡æ??æ?¶å?°ï¼?å?¯è?½æ?¯å? ä¸ºå®?å¯¹äº?æ?¨ç??ç?µå?é?®ç®±æ??ä¾?å??æ?¥è¯´è¿?äº?åº?å¤§ã??è¯·è¯?ç??ç?¨gmail.comæ??è??yahoo.cn"
-"ç??è´¦æ?·é??æ?°å??é??è¯·æ±?æ??ä»¶ã??è??ä¸?ï¼?å°?è¯?è¯·æ±?tor-browser-bundleè??å°½é??ä¸?æ?¯tor-im-browserï¼?å? ä¸ºå??è??æ?´å°?ä¸?ç?¹ã??\n"
+"å¦?æ??æ??ä»¶å??æ²¡æ??æ?¶å?°ï¼?å?¯è?½æ?¯å? ä¸ºå®?å¯¹äº?æ?¨ç??ç?µå?é?®ç®±æ??ä¾?å??æ?¥è¯´è¿?äº?åº?å¤§ã??è¯·è¯?ç??ç?¨"
+"gmail.comæ??è??yahoo.cnç??è´¦æ?·é??æ?°å??é??è¯·æ±?æ??ä»¶ã??è??ä¸?ï¼?å°?è¯?è¯·æ±?tor-browser-bundle"
+"è??å°½é??ä¸?æ?¯tor-im-browserï¼?å? ä¸ºå??è??æ?´å°?ä¸?ç?¹ã??\n"
 "    "
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
+#, fuzzy
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
 "\n"
-"å¾?é??æ?¾æ??ä»¬ç?®å??é??å?°ä¸?äº?é?®é¢?ï¼?æ??ä»¬ä¸?è?½ç«?å?»å®?ç?°æ?¨ç??è¯·æ±?ã??è¯·æ?¨è??å¿?ç?å¾?ï¼?æ??ä»¬ä¼?å°?è¯?è§£å?³æ¤é?®é¢?ã??\n"
+"å¾?é??æ?¾æ??ä»¬ç?®å??é??å?°ä¸?äº?é?®é¢?ï¼?æ??ä»¬ä¸?è?½ç«?å?»å®?ç?°æ?¨ç??è¯·æ±?ã??è¯·æ?¨è??å¿?ç?å¾?ï¼?æ??ä»¬ä¼?å°?"
+"è¯?è§£å?³æ¤é?®é¢?ã??\n"
 "    "
 
 #~ msgid ""
 #~ "\n"
+#~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
+#~ "        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
+#~ "        \".exe.asc\"\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "3.)å°?å??ç¼?å??ä¸ºâ??.ex_RENAME\"ç??æ??ä»¶æ?¹æ??ä»¥â??.exeâ??ä¸ºå??ç¼?ç??æ??ä»¶ï¼?å°?å??ç¼?å??ä¸º \"."
+#~ "ex_RENAME.asc\" ç??æ??ä»¶æ?¹æ??ä»¥\".exe.asc\"ä¸ºå??ç¼?å??ã??"
+
+#~ msgid ""
+#~ "\n"
+#~ "    SUPPORT\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "æ?¯æ??\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "       gpg --verify <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "gpg --éª?è¯? <packagename>.asc <packagename>\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
 #~ "\n"
 #~ "    Unfortunately, we won't answer you at this address. You should make\n"
@@ -588,10 +507,12 @@ msgstr ""
 #~ "    one of those.\n"
 #~ "\n"
 #~ "    We only process requests from email services that support \"DKIM\",\n"
-#~ "    which is an email feature that lets us verify that the address in the\n"
+#~ "    which is an email feature that lets us verify that the address in "
+#~ "the\n"
 #~ "    \"From\" line is actually the one who sent the mail.\n"
 #~ "\n"
-#~ "    (We apologize if you didn't ask for this mail. Since your email is from\n"
+#~ "    (We apologize if you didn't ask for this mail. Since your email is "
+#~ "from\n"
 #~ "    a service that doesn't use DKIM, we're sending a short explanation,\n"
 #~ "    and then we'll ignore this email address for the next day or so.)\n"
 #~ "\n"
@@ -616,7 +537,8 @@ msgstr ""
 #~ "  æ??ä»¬è¿?é??å??é??ä¸?æ?¡ç®?ç?ç??é??ç?¥ï¼?å¹¶å°?å?¨ä»¥å??ç??å? å¤©é??å¿½ç?¥è¯¥é?®å??ï¼?\n"
 #~ "  ä»¥å??å½¢æ??å??å?¾å??å¤?ã??)\n"
 #~ "\n"
-#~ "   è¯·æ³¨æ??ï¼?æ??ä»¬ç?®å??æ? æ³?å¤?ç??HTMLæ??Base64ç¼?ç ?ç??é?®ä»¶ï¼?æ?¨å?ªè?½å??é??çº¯æ??æ?¬è¯·æ±?ã??\n"
+#~ "   è¯·æ³¨æ??ï¼?æ??ä»¬ç?®å??æ? æ³?å¤?ç??HTMLæ??Base64ç¼?ç ?ç??é?®ä»¶ï¼?æ?¨å?ªè?½å??é??çº¯æ??æ?¬è¯·"
+#~ "æ±?ã??\n"
 #~ "\n"
 #~ "   å¦?æ??æ?¨é??å?°ä»»ä½?é?®é¢?è¯·è??ç³»æ??ä»¬ç??æ??æ?¯æ?¯æ??é?®ç®±ï¼?\n"
 #~ "     tor-assistants@xxxxxxxxxxxxxx\n"
@@ -760,8 +682,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -847,8 +769,8 @@ msgstr ""
 #~ "    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"
+#~ "    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"
@@ -912,8 +834,8 @@ msgstr ""
 #~ "\n"
 #~ "    Hello, This is the \"GetTor\" robot.\n"
 #~ "\n"
-#~ "    Thank you for your request. It was successfully understood. Your request "
-#~ "is\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"
diff --git a/i18n/zh_HK/gettor.po b/i18n/zh_HK/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/zh_HK/gettor.po
+++ b/i18n/zh_HK/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/zh_TW/gettor.po b/i18n/zh_TW/gettor.po
index c87fe80..e0961a8 100644
--- a/i18n/zh_TW/gettor.po
+++ b/i18n/zh_TW/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \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"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/i18n/zu/gettor.po b/i18n/zu/gettor.po
index e7e6736..a711308 100644
--- a/i18n/zu/gettor.po
+++ b/i18n/zu/gettor.po
@@ -7,135 +7,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-14 14:10+0100\n"
+"POT-Creation-Date: 2011-02-24 11:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/constants.py:388
+#: lib/gettor/i18n.py:406
 msgid ""
+"Hello, This is the \"GetTor\" robot.\n"
 "\n"
-"    Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"    Thank you for your request.\n"
-"\n"
-"    "
+"Thank you for your request."
 msgstr ""
 
-#: lib/gettor/constants.py:394
+#: lib/gettor/i18n.py:410
 msgid ""
-"\n"
-"    Unfortunately, we won't answer you at this address. You should make\n"
-"    an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
-"    one of those.\n"
-"\n"
-"    "
+" 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."
 msgstr ""
 
-#: lib/gettor/constants.py:400
+#: lib/gettor/i18n.py:414
 msgid ""
-"\n"
-"    We only process requests from email services that support \"DKIM\",\n"
-"    which is an email feature that lets us verify that the address in the\n"
-"    \"From\" line is actually the one who sent the mail.\n"
-"\n"
-"    "
+"We only process requests from email services that support \"DKIM\",\n"
+"which is an email feature that lets us verify that the address in the\n"
+"\"From\" line is actually the one who sent the mail."
 msgstr ""
 
-#: lib/gettor/constants.py:406
+#: lib/gettor/i18n.py:418
 msgid ""
-"\n"
-"    (We apologize if you didn't ask for this mail. Since your email is from\n"
-"    a service that doesn't use DKIM, we're sending a short explanation,\n"
-"    and then we'll ignore this email address for the next day or so.)\n"
-"\n"
-"    "
+"(We apologize if you didn't ask for this mail. Since your email is from\n"
+"a service that doesn't use DKIM, we're sending a short explanation,\n"
+"and then we'll ignore this email address for the next day or so.)"
 msgstr ""
 
-#: lib/gettor/constants.py:412
+#: lib/gettor/i18n.py:422
 msgid ""
-"\n"
-"    Please note that currently, we can't process HTML emails or base 64\n"
-"    mails. You will need to send plain text.\n"
-"\n"
-"    "
+"Please note that currently, we can't process HTML emails or base 64\n"
+"mails. You will need to send plain text."
 msgstr ""
 
-#: lib/gettor/constants.py:418 lib/gettor/constants.py:575
+#: lib/gettor/i18n.py:425 lib/gettor/i18n.py:498
 msgid ""
-"\n"
-"    If you have any questions or it doesn't work, you can contact a\n"
-"    human at this support email address: tor-assistants@xxxxxxxxxxxxxx\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"
 msgstr ""
 
-#: lib/gettor/constants.py:423
+#: lib/gettor/i18n.py:428
 msgid ""
-"\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"
-"    "
+"I will mail you a Tor package, if you tell me which one you want.\n"
+"Please select one of the following package names:"
 msgstr ""
 
-#: lib/gettor/constants.py:436
+#: lib/gettor/i18n.py:431
 msgid ""
-"\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 reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 
-#: lib/gettor/constants.py:441
-msgid ""
-"\n"
-"    OBTAINING LOCALIZED VERSIONS OF TOR\n"
-"    "
+#: lib/gettor/i18n.py:434
+msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
 msgstr ""
 
-#: lib/gettor/constants.py:448
+#: lib/gettor/i18n.py:436
 msgid ""
-"\n"
-"    To get a version of Tor translated into your language, specify the\n"
-"    language you want in the address you send the mail to:\n"
-"\n"
-"    "
+"To get a version of Tor translated into your language, specify the\n"
+"language you want in the address you send the mail to:"
 msgstr ""
 
-#: lib/gettor/constants.py:457
+#: lib/gettor/i18n.py:439
 msgid ""
-"\n"
-"    This example will give you the requested package in a localized\n"
-"    version for Chinese. Check below for a list of supported language\n"
-"    codes.\n"
-"\n"
-"    "
+"This example will give you the requested package in a localized\n"
+"version for Chinese. Check below for a list of supported language\n"
+"codes. "
 msgstr ""
 
-#: lib/gettor/constants.py:463
-msgid ""
-"\n"
-"    List of supported locales:\n"
-"    "
+#: lib/gettor/i18n.py:443
+msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/constants.py:470
-msgid ""
-"\n"
-"    Here is a list of all available languages:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:445
+msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/constants.py:474
+#: lib/gettor/i18n.py:447
 msgid ""
-"\n"
 "    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
 "    gettor+en@xxxxxxxxxxxxxx:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
 "    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
 "    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
 msgstr ""
 
-#: lib/gettor/constants.py:488
-msgid ""
-"\n"
-"    If you select no language, you will receive the English version.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:459
+msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/constants.py:493
-msgid ""
-"\n"
-"    SMALLER SIZED PACKAGES\n"
-"    "
+#: lib/gettor/i18n.py:461
+msgid "SMALLER SIZED PACKAGES"
 msgstr ""
 
-#: lib/gettor/constants.py:499
+#: lib/gettor/i18n.py:463
 msgid ""
-"\n"
-"    If your bandwith is low or your provider doesn't allow you to \n"
-"    receive large attachments in your email, there is a feature of \n"
-"    GetTor you can use to make it send you a number of small packages\n"
-"    instead of one big one.\n"
-"\n"
-"    "
+"If your bandwith is low or your provider doesn't allow you to \n"
+"receive large attachments in your email, there is a feature of \n"
+"GetTor you can use to make it send you a number of small packages\n"
+"instead of one big one."
 msgstr ""
 
-#: lib/gettor/constants.py:506
-msgid ""
-"\n"
-"    Simply include the keyword 'split' somewhere in your email like so:\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:515
-msgid ""
-"\n"
-"    Sending this text in an email to GetTor will cause it to send you \n"
-"    the Tor Browser Bundle in a number of 1,4MB attachments.\n"
-"\n"
-"    "
-msgstr ""
-
-#: lib/gettor/constants.py:520
-msgid ""
-"\n"
-"    After having received all parts, you need to re-assemble them to \n"
-"    one package again. This is done as follows:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:468
+msgid "Simply include the keyword 'split' somewhere in your email like so:"
 msgstr ""
 
-#: lib/gettor/constants.py:525
+#: lib/gettor/i18n.py:470
 msgid ""
-"\n"
-"    1.) Save all received attachments into one folder on your disk.\n"
-"    \n"
-"    "
+"Sending this text in an email to GetTor will cause it to send you \n"
+"the Tor Browser Bundle in a number of 1,4MB attachments."
 msgstr ""
 
-#: lib/gettor/constants.py:529
+#: lib/gettor/i18n.py:473
 msgid ""
-"\n"
-"    2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"        a fresh folder before, simply unzip all files in that folder.\n"
-"\n"
-"    "
+"After having received all parts, you need to re-assemble them to \n"
+"one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/constants.py:534
-msgid ""
-"\n"
-"    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
-"        also rename the file ending in \".ex_RENAME.asc\" to end in\n"
-"        \".exe.asc\"\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:476
+msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/constants.py:540
+#: lib/gettor/i18n.py:478
 msgid ""
-"\n"
-"    4.) Verify all files as described in the mail you received with \n"
-"        each package. (gpg --verify)\n"
-"\n"
-"    "
+"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
+"a fresh folder before, simply unzip all files in that folder."
 msgstr ""
 
-#: lib/gettor/constants.py:545
+#: lib/gettor/i18n.py:481
 msgid ""
-"\n"
-"    5.) Now use a program that can unrar multivolume RAR archives. On\n"
-"        Windows, this usually is WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
+"3.) Verify all files as described in the mail you received with \n"
+"each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/constants.py:555
+#: lib/gettor/i18n.py:484
 msgid ""
-"\n"
-"        To unpack your Tor package, simply doubleclick the \".exe\" file.\n"
-"\n"
-"    "
+"4.) Now use a program that can unrar multivolume RAR archives. On\n"
+"Windows, this usually is WinRAR. If you don't have that\n"
+"installed on you computer yet, get it here:"
 msgstr ""
 
-#: lib/gettor/constants.py:559
-msgid ""
-"\n"
-"    6.) After unpacking is finished, you should find a newly created \n"
-"        \".exe\" file in your destination folder. Simply doubleclick\n"
-"        that and Tor Browser Bundle should start within a few seconds.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:488
+msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
 msgstr ""
 
-#: lib/gettor/constants.py:565
+#: lib/gettor/i18n.py:490
 msgid ""
-"\n"
-"    7.) That's it. You're done. Thanks for using Tor and have fun!\n"
-"    \n"
-"    "
+"5.) After unpacking is finished, you should find a newly created \n"
+"\".exe\" file in your destination folder. Simply doubleclick\n"
+"that and Tor Browser Bundle should start within a few seconds."
 msgstr ""
 
-#: lib/gettor/constants.py:569
-msgid ""
-"\n"
-"    SUPPORT\n"
-"    "
+#: lib/gettor/i18n.py:494
+msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/constants.py:580
-msgid ""
-"\n"
-"    Here's your requested software as a zip file. Please unzip the\n"
-"    package and verify the signature.\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:496
+msgid "SUPPORT"
 msgstr ""
 
-#: lib/gettor/constants.py:585
+#: lib/gettor/i18n.py:501
 msgid ""
-"\n"
-"    Hint: If your computer has GnuPG installed, use the gpg\n"
-"    commandline tool as follows after unpacking the zip file:\n"
-"\n"
-"    "
+" Here's your requested software as a zip file. Please unzip the\n"
+"package and verify the signature."
 msgstr ""
 
-#: lib/gettor/constants.py:590
+#: lib/gettor/i18n.py:504
 msgid ""
-"\n"
-"       gpg --verify <packagename>.asc <packagename>\n"
-"\n"
-"    "
+"Hint: If your computer has GnuPG installed, use the gpg\n"
+"commandline tool as follows after unpacking the zip file:"
 msgstr ""
 
-#: lib/gettor/constants.py:594
-msgid ""
-"\n"
-"    The output should look somewhat like this:\n"
-"\n"
-"    "
+#: lib/gettor/i18n.py:507
+msgid "The output should look somewhat like this:"
 msgstr ""
 
-#: lib/gettor/constants.py:602
+#: lib/gettor/i18n.py:509
 msgid ""
-"\n"
-"    If you're not familiar with commandline tools, try looking for\n"
-"    a graphical user interface for GnuPG on this website:\n"
-"\n"
-"    "
+"If you're not familiar with commandline tools, try looking for\n"
+"a graphical user interface for GnuPG on this website:"
 msgstr ""
 
-#: lib/gettor/constants.py:611
+#: lib/gettor/i18n.py:512
 msgid ""
-"\n"
-"    If your Internet connection blocks access to the Tor network, you\n"
-"    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"    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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:620
+#: lib/gettor/i18n.py:519
 msgid ""
-"\n"
-"    You can acquire a bridge by sending an email that contains \"get bridges"
-"\"\n"
-"    in the body of the email to the following email address:\n"
-"    bridges@xxxxxxxxxxxxxx\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:"
 msgstr ""
 
-#: lib/gettor/constants.py:626
+#: lib/gettor/i18n.py:522
 msgid ""
-"\n"
-"    It is also possible to fetch bridges with a web browser at the "
-"following\n"
-"    url: https://bridges.torproject.org/\n";
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/";
 msgstr ""
 
-#: lib/gettor/constants.py:631
+#: lib/gettor/i18n.py:525
 msgid ""
-"\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"
-"    "
+"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."
 msgstr ""
 
-#: lib/gettor/constants.py:639
+#: lib/gettor/i18n.py:531
 msgid ""
-"\n"
-"    Packages might come out of order! Please make sure you received\n"
-"    all packages before you attempt to unpack them!\n"
-"\n"
-"    "
+"Packages might arrive out of order! Please make sure you received\n"
+"all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/constants.py:644
+#: lib/gettor/i18n.py:534
 msgid ""
-"\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"
-"    "
+"Thank you for your request. \n"
+"It was successfully understood. Your request is currently being processed.\n"
+"Your package should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/constants.py:650
+#: lib/gettor/i18n.py:538
 msgid ""
-"\n"
-"    If it doesn't arrive, the package might be too big for your mail "
-"provider.\n"
-"    Try resending the mail from a gmail.com or yahoo.cn account. Also,\n"
-"    try asking for tor-browser-bundle rather than tor-im-browser-bundle,\n"
-"    since it's smaller.\n"
-"\n"
-"    "
+"If 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.COM account."
 msgstr ""
 
-#: lib/gettor/constants.py:657
+#: lib/gettor/i18n.py:541
 msgid ""
-"\n"
-"    Unfortunately we are currently experiencing problems and we can't "
-"fulfill\n"
-"    your request right now. Please be patient as we try to resolve this "
-"issue.\n"
-"\n"
-"    "
+"Unfortunately we are currently experiencing problems and we can't fulfill\n"
+"your request right now. Please be patient as we try to resolve this issue."
 msgstr ""
diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py
index 92a2165..9cb1239 100644
--- a/lib/gettor/i18n.py
+++ b/lib/gettor/i18n.py
@@ -1,6 +1,7 @@
 # Copyright (c) 2008 - 2011, Jacob Appelbaum <jacob@xxxxxxxxxxxxx>, 
 #                            Christian Fromme <kaner@xxxxxxxxxx>
 #  This is Free Software. See LICENSE for license information.
+# -*- coding: utf-8 -*-
 
 import os
 import gettext
@@ -430,8 +431,7 @@ Please select one of the following package names:"""),
 _("""Please reply to this mail (to gettor@xxxxxxxxxxxxxx), and tell me
 a single package name anywhere in the body of your email."""),
  # GETTOR_TEXT[8]
-_(""" OBTAINING LOCALIZED VERSIONS OF TOR
-==================================="""),
+_(""" OBTAINING LOCALIZED VERSIONS OF TOR"""),
  # GETTOR_TEXT[9]
 _("""To get a version of Tor translated into your language, specify the
 language you want in the address you send the mail to:"""),
@@ -440,8 +440,7 @@ _("""This example will give you the requested package in a localized
 version for Chinese. Check below for a list of supported language
 codes. """),
  # GETTOR_TEXT[11]
-_(""" List of supported locales:
--------------------------"""),
+_(""" List of supported locales:"""),
  # GETTOR_TEXT[12]
 _("""Here is a list of all available languages:"""),
  # GETTOR_TEXT[13]
@@ -459,8 +458,7 @@ _("""    gettor+ar@xxxxxxxxxxxxxx:     Arabic
  # GETTOR_TEXT[14]
 _("""If you select no language, you will receive the English version."""),
  # GETTOR_TEXT[15]
-_("""SMALLER SIZED PACKAGES
-======================"""),
+_("""SMALLER SIZED PACKAGES"""),
  # GETTOR_TEXT[16]
 _("""If your bandwith is low or your provider doesn't allow you to 
 receive large attachments in your email, there is a feature of 
@@ -495,8 +493,7 @@ that and Tor Browser Bundle should start within a few seconds."""),
  # GETTOR_TEXT[26]
 _("""6.) That's it. You're done. Thanks for using Tor and have fun!"""),
  # GETTOR_TEXT[27]
-_("""SUPPORT
-======="""),
+_("""SUPPORT"""),
  # GETTOR_TEXT[28]
 _("""If you have any questions or it doesn't work, you can contact a
 human at this support email address: tor-assistants@xxxxxxxxxxxxxx"""),
@@ -531,7 +528,7 @@ all split files to be received by you before you can save them all
 into the same directory and unpack them by double-clicking the
 first file."""),
  # GETTOR_TEXT[37]
-_("""Packages mighit come out of order! Please make sure you received
+_("""Packages might arrive out of order! Please make sure you received
 all packages before you attempt to unpack them!"""),
  # GETTOR_TEXT[38]
 _("""Thank you for your request. 
diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py
index 248c0ac..c9dba54 100644
--- a/lib/gettor/responses.py
+++ b/lib/gettor/responses.py
@@ -110,7 +110,6 @@ class Response:
         logging.info(str(self.reqInfo))
 
         # Initialize locale subsystem
-        gettext.install("gettor", unicode=True)
         self.t = i18n.getLang(self.reqInfo['locale'])
 
         # Init black & whitelists
diff --git a/setup.py b/setup.py
index b0fcc61..a88aed5 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ class createTrans(Command):
                         print 'Compiling %s' % src
                         self.msgfmt(src, dest)
     def msgfmt(self, src, dest):
-        args = src + " -o " + dest
+        args = src + " -f -o " + dest
         try:
             ret = subprocess.call("msgfmt" + " " + args, shell=True)
             if ret < 0:

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [gettor/master] General Overhaul and Major Cleanup are happy to have worked hard.
Next by Author: [tor-commits] [weather/master] If 0.2.1.34 is stable, that means 0.2.1.34-dev is fine, too
Previous by thread: [tor-commits] [gettor/master] General Overhaul and Major Cleanup are happy to have worked hard.
Next by thread: [tor-commits] r24264: {} add the HFOSS presentation from today. (projects/presentations)
Index(es):
- Author
- Thread