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

kaner at torproject.org kaner at torproject.org
Thu Feb 24 19:12:00 UTC 2011


commit 76b97197002398ac776963d03670bbc5b1639382
Author: Christian Fromme <kaner at strace.org>
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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
 "    إن كانت لديك أسئلة أو لم تنفع محاولتك، يرجى الاتصال\n"
-"    بشخص بشري على عنوان البريد الإلكتروني التالي: tor-"
-"assistants at torproject.org\n"
+"    بشخص بشري على عنوان البريد الإلكتروني التالي: tor-assistants at 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    يرجى الرد على هذه الرسالة (على gettor at torproject.org )، وأن تخبرني\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -212,9 +186,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:    العربية\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 at torproject.org\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 at torproject.org\n"
 #~ "\n"
@@ -846,7 +758,8 @@ msgstr ""
 #~ "\n"
 #~ "الإخراج ينبغي أن ننظر إلى حد ما من هذا القبيل : \n"
 #~ "\n"
-#~ "المنافع العامة العالمية : التوقيع جيد من \"Roger Dingledine <arma at mit.edu>\"  \n"
+#~ "المنافع العامة العالمية : التوقيع جيد من \"Roger Dingledine <arma at mit.edu>"
+#~ "\"  \n"
 #~ "\n"
 #~ "إذا كنت لم تكن مألوفة مع أدوات سطر الأوامر ، ومحاولة البحث عن \n"
 #~ "واجهة مستخدم رسومية لGnuPG على هذا الموقع : \n"
@@ -868,8 +781,8 @@ msgstr ""
 #~ "عنوان الموقع : https://bridges.torproject.org / \n"
 #~ "\n"
 #~ "إذا كان لديك أي أسئلة أو أنه لا يعمل ، يمكنك الاتصال على \n"
-#~ "الإنسان في هذا الدعم عنوان البريد الإلكتروني : tor-assistants at torproject.org "
-#~ "\n"
+#~ "الإنسان في هذا الدعم عنوان البريد الإلكتروني : tor-assistants at 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 at torproject.org\n"
 #~ "\n"
@@ -967,15 +880,15 @@ msgstr ""
 #~ "عنوان الموقع : https://bridges.torproject.org / \n"
 #~ "\n"
 #~ "إذا كان لديك أي أسئلة أو أنه لا يعمل ، يمكنك الاتصال على \n"
-#~ "الإنسان في هذا الدعم عنوان البريد الإلكتروني : tor-assistants at torproject.org "
-#~ "\n"
+#~ "الإنسان في هذا الدعم عنوان البريد الإلكتروني : tor-assistants at 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at yahoo.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "                  Lütfən bu poçta (gettor at torproject.org-a) 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -219,9 +194,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: Ərəb\n"
@@ -237,36 +210,29 @@ msgstr ""
 "gettor+zh at torproject.org: Ç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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
-"    အကယ္၍မ်ား သင့္မွာ ေမးစရာ ေမးခြန္းရွိရင္ပဲ ျဖစ္ျဖစ္ အလုပ္မလုပ္လို႔ပဲ "
-"ျဖစ္ျဖစ္\n"
+"    အကယ္၍မ်ား သင့္မွာ ေမးစရာ ေမးခြန္းရွိရင္ပဲ ျဖစ္ျဖစ္ အလုပ္မလုပ္လို႔ပဲ ျဖစ္ျဖစ္\n"
 "    အီးေမးလ္လိပ္စာ : tor-assistants at 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"
-"    ဘယ္တစ္ခုကို သင္လိုခ်င္လဲ ဆိုတာ ကၽြန္ေတာ္တို႔ကိုေျပာရင္ 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    ေက်းဇူးျပဳ၍ (gettor at torproject.org) ကို အေၾကာင္းျပန္ပါ။\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -219,9 +188,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:     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 at torproject.org\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 at torproject.org\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 at hotmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
-"আপনার যদি কোন প্রশ্ন থাকে অথবা এটি কাজ না করে, আপনারা কোন সাহায্যকারী "
-"ব্যক্তিকে\n"
+"আপনার যদি কোন প্রশ্ন থাকে অথবা এটি কাজ না করে, আপনারা কোন সাহায্যকারী ব্যক্তিকে\n"
 "এই সহায়ক ইমেইল ঠিকানায় মেইল করতে পারেন: tor-assistants at 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"
@@ -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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "অনুগ্রহ করে এই ঠিকানায় জবাব পাঠান (প্রতি gettor at torproject.org), এবং আমাকে "
@@ -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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -218,9 +189,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: আরবী\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 at torproject.org\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Siusplau respon a aquest email (to gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -211,9 +187,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: 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 at torproject.org\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 at czech-city.eu>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -153,270 +113,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     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 at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at chaosbyte.dk>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at 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"
 "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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Besvar venligst denne email (til gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -210,9 +185,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: 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 at torproject.org\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 at carlostrub.ch>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    Bitte antworten Sie auf diese E-mail (an gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -217,9 +192,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:     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 at torproject.org\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 at torproject.org 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 at torproject.org\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 at torproject.org\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 at torproject.org), 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 at torproject.org\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 at torproject.org:     Arabic\n"
-#~ "    gettor+de at torproject.org:     German\n"
-#~ "    gettor+en at torproject.org:     English\n"
-#~ "    gettor+es at torproject.org:     Spanish\n"
-#~ "    gettor+fa at torproject.org:     Farsi (Iran)\n"
-#~ "    gettor+fr at torproject.org:     French\n"
-#~ "    gettor+it at torproject.org:     Italian\n"
-#~ "    gettor+nl at torproject.org:     Dutch\n"
-#~ "    gettor+pl at torproject.org:     Polish\n"
-#~ "    gettor+ru at torproject.org:     Russian\n"
-#~ "    gettor+zh at torproject.org:     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 at torproject.org\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 at torproject.org), 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 at torproject.org\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 at torproject.org: Arabisch\n"
-#~ "gettor+de at torproject.org: Deutsch\n"
-#~ "gettor+en at torproject.org: Englisch\n"
-#~ "gettor+es at torproject.org: Spanisch\n"
-#~ "gettor+fa at torproject.org: Farsi (Iran)\n"
-#~ "gettor+fr at torproject.org: Französisch\n"
-#~ "gettor+it at torproject.org: Italienisch\n"
-#~ "gettor+nl at torproject.org: Holländisch\n"
-#~ "gettor+pl at torproject.org: Polnisch\n"
-#~ "gettor+ru at torproject.org: Russisch\n"
-#~ "gettor+zh at torproject.org: 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 at torproject.org\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 at mit.edu>\"\n"
-#~ "\n"
-#~ "    If you're not familiar with commandline tools, try looking for\n"
-#~ "    a graphical user interface for GnuPG on this website:\n"
-#~ "\n"
-#~ "       http://www.gnupg.org/related_software/frontends.html\n"
-#~ "\n"
-#~ "    If your Internet connection blocks access to the Tor network, you\n"
-#~ "    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-#~ "    are Tor relays that aren't listed in the main directory. Since there\n"
-#~ "    is no complete public list of them, even if your ISP is filtering\n"
-#~ "    connections to all the known Tor relays, they probably won't be able\n"
-#~ "    to block all the bridges.\n"
-#~ "\n"
-#~ "    You can acquire a bridge by sending an email that contains \"get bridges"
-#~ "\"\n"
-#~ "    in the body of the email to the following email address:\n"
-#~ "    bridges at torproject.org\n"
-#~ "\n"
-#~ "    It is also possible to fetch bridges with a web browser at the "
-#~ "following\n"
-#~ "    url: https://bridges.torproject.org/\n"
-#~ "\n"
-#~ "    If you have any questions or it doesn't work, you can contact a\n"
-#~ "    human at this support email address: tor-assistants at torproject.org\n"
-#~ "\n"
-#~ "        "
-#~ msgstr ""
-#~ "\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 at mit.edu>\"\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 at torproject.org\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 at torproject.org\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 at mit.edu>\"\n"
-#~ "\n"
-#~ "    If you're not familiar with commandline tools, try looking for\n"
-#~ "    a graphical user interface for GnuPG on this website:\n"
-#~ "\n"
-#~ "       http://www.gnupg.org/related_software/frontends.html\n"
-#~ "\n"
-#~ "    If your Internet connection blocks access to the Tor network, you\n"
-#~ "    may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-#~ "    are Tor relays that aren't listed in the main directory. Since there\n"
-#~ "    is no complete public list of them, even if your ISP is filtering\n"
-#~ "    connections to all the known Tor relays, they probably won't be able\n"
-#~ "    to block all the bridges.\n"
-#~ "\n"
-#~ "    You can acquire a bridge by sending an email that contains \"get bridges"
-#~ "\"\n"
-#~ "    in the body of the email to the following email address:\n"
-#~ "    bridges at torproject.org\n"
-#~ "\n"
-#~ "    It is also possible to fetch bridges with a web browser at the "
-#~ "following\n"
-#~ "    url: https://bridges.torproject.org/\n"
-#~ "\n"
-#~ "    If you have any questions or it doesn't work, you can contact a\n"
-#~ "    human at this support email address: tor-assistants at torproject.org\n"
-#~ "\n"
-#~ "        "
-#~ msgstr ""
-#~ "\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 at mit.edu>\"\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Por favor, responda este correo (a gettor at torproject.org) 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -218,9 +192,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:     Á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 at torproject.org\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 at torproject.org\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 at torproject.org\n"
 #~ "        "
@@ -793,7 +714,8 @@ msgstr ""
 #~ "tor-im-browser-bundle\n"
 #~ "source-bundle\n"
 #~ "\n"
-#~ "    Por favor, responda a este correo (a gettor at torproject.org), y me dicen\n"
+#~ "    Por favor, responda a este correo (a gettor at torproject.org), 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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -151,270 +112,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     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 at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
-"اگر سوالي داريد يا اينكه برنامه كار نميكند،ميتوانيد با ايميل پشتيباني با\n "
-"آدرس:tor-assistants at torproject.org  اين تماس بگيري\nد"
-"\n"
+"اگر سوالي داريد يا اينكه برنامه كار نميكند،ميتوانيد با ايميل پشتيباني با\n"
+" آدرس:tor-assistants at 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"
-"اگر توضیح بدهید که کدام یک از بسته های اطلاعاتی 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
-"لطفن به این ایمیل (gettor at torproject.rog)پاسخی ارسال کنید و نام یک بسته ی\n "
-"اطلاعاتی واحد را در هر کجا از بدنه ی ایمیل وارد کنید\n."
-"\n"
+"لطفن به این ایمیل (gettor at torproject.rog)پاسخی ارسال کنید و نام یک بسته ی\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -214,9 +189,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: عربي\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 at torproject.org\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 at torproject.org که کلمه ی \"get bridge\" را \n"
+"با ارسال یک ایمیل به آدرس: bridges at torproject.org که کلمه ی \"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 at torproject.org ) و در قسمتی از "
-#~ "متن ایمیل خود نام یکی از بسته های فوق را ذکر کنید. \n"
+#~ "لطفا به این نامه پاسخ داده ( به آدرس gettor at torproject.org ) و در قسمتی "
+#~ "از متن ایمیل خود نام یکی از بسته های فوق را ذکر کنید. \n"
 #~ "\n"
 #~ "تهیه نسخه ترجمه شده  TOR  \n"
 #~ "===================================\n"
 #~ "\n"
-#~ "برای دریافت نسخه ای از TOR  ترجمه شده به زبان محلی شما، می بایستی زبان مورد "
-#~ "نظر خود را در آدرس گیرنده ایمیل ذکر کنید. بعنوان مثال:  \n"
+#~ "برای دریافت نسخه ای از TOR  ترجمه شده به زبان محلی شما، می بایستی زبان "
+#~ "مورد نظر خود را در آدرس گیرنده ایمیل ذکر کنید. بعنوان مثال:  \n"
 #~ "\n"
 #~ "gettor+zh at torproject.org\n"
 #~ "\n"
-#~ "در این مثال، فرستنده خواهان نسخه ترجمه شده به زبان چینی می باشد. برای آگاهی "
-#~ "از کدهای مربوط به زبانهای قابل پشتیبانی توسط Tor ، فهرست زیر را مطالعه کنید: "
-#~ "فهرست زبانهای پشتیانی شده\n"
+#~ "در این مثال، فرستنده خواهان نسخه ترجمه شده به زبان چینی می باشد. برای "
+#~ "آگاهی از کدهای مربوط به زبانهای قابل پشتیبانی توسط Tor ، فهرست زیر را "
+#~ "مطالعه کنید: فهرست زبانهای پشتیانی شده\n"
 #~ "-------------------------\n"
 #~ "\n"
 #~ "gettor+ar at torproject.org: 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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
-"	Mikäli sinulla on kysymyksiä joihin tarvitset\n"
-"	henkilökohtaisen vastauksen, voit lähettää sähköpostia\n"
-"	osoitteella tor-assistants at torproject.org\n"
+"\tMikäli sinulla on kysymyksiä joihin tarvitset\n"
+"\thenkilökohtaisen vastauksen, voit lähettää sähköpostia\n"
+"\tosoitteella tor-assistants at 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"
-"	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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
-"	Vastaa (reply) tähän sähköpostiin (to gettor at torproject.org)\n"
-"	ja sisällytä haluamasi paketin nimi sähköpostin\n"
-"	tekstiosuuteen.\n"
+"\tVastaa (reply) tähän sähköpostiin (to gettor at torproject.org)\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -215,9 +189,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at acm.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org\n"
+"    Si vous avez des questions ou si ça ne marche pas, vous pouvez "
+"contacter\n"
+"    un humain à cette adresse de support :     tor-assistants at 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    Veuillez répondre à ce courriel (à gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -219,9 +196,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:     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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
-"Mohon balas ke mail ini (to gettor at torproject.org), dan beritahu kami sebuah\n"
+"Mohon balas ke mail ini (to gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -210,9 +189,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: 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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Vinsamlegast svaraðu á þetta netfang (gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -205,9 +180,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: 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 at torproject.org\n"
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/"
 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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
 "Se hai qualche domanda o malfunzionamenti, è possibile contattare una\n"
 "persona a questo indirizzo: tor-assistants at 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"
 "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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Per favore rispondi a questa mail (a gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -203,9 +176,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: Arabo\n"
@@ -221,35 +192,28 @@ msgstr ""
 "gettor+zh at torproject.org: 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 at torproject.org\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 at computer.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
 "    もしもご質問がある場合や動作しない場合には、以下のメール\n"
-"    アドレスで相談員にコンタクトすることができます: tor-assistants at torproject.org\n"
+"    アドレスで相談員にコンタクトすることができます: tor-"
+"assistants at 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"
-"    どれが必要か指示していただければ、のちほど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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    このメールの送信元 (gettor at torproject.org)に返信して、\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -192,238 +166,144 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\n"
-"\n"
-"    "
+"It is also possible to fetch bridges with a web browser at the following\n"
+"url: https://bridges.torproject.org/"
 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at s0f.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -170,270 +135,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     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 at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -147,272 +106,159 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at xs4all.nl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
 "Voor vragen kunt u contact opnemen met tor-assistants at torproject.org\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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Antwoord op dit e-mailadres (gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -212,9 +187,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: 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 at torproject.org\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    ProszÄ™ odpisz na ten list (na gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -210,9 +184,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at goukihq.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -145,273 +105,170 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at 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: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 at torproject.org\n"
+#~ "Se tiver alguma dúvida, pode contactar um humano no seguinte endereço: "
+#~ "tor-assistants at torproject.org\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 at torproject.org), 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 at torproject.org), 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 at torproject.org\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 at torproject.org\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 at mit.edu>\"\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 at torproject.org\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 at torproject.org\n"
+#~ "Se tiver alguma dúvida, pode contactar um humano no seguinte endereço: "
+#~ "tor-assistants at torproject.org\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 at torproject.org\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 at mit.edu>\"\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 at torproject.org\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 at torproject.org\n"
+#~ "Se tiver alguma dúvida, pode contactar um humano no seguinte endereço: "
+#~ "tor-assistants at torproject.org\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 at torproject.org\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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -159,272 +120,159 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     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 at torproject.org:     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 at torproject.org\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    Пожалуйста, отправьте письмо на адрес gettor at torproject.org, указав\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -218,9 +192,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:     Арабский\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 at torproject.org\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 at torproject.org), и укажите\n"
+#~ "Пожалуйста свяжитесь с нами по этой элктронной почте (gettor at torproject."
+#~ "org), и укажите\n"
 #~ "название одного из пакетов в любом месте в \"теле\" вашего письма.\n"
 #~ "\n"
 #~ "ПОЛУЧЕНИЕ ЛОКАЛИЗИРОВАННЫХ ВЕРСИЙ TOR\n"
 #~ "===================================\n"
 #~ "\n"
 #~ "Чтобы получить версию Tor переведенную на ваш язык,укажите\n"
-#~ "предпочитаемый язык в адресной строке куда вы отослали электронную почту:\n"
+#~ "предпочитаемый язык в адресной строке куда вы отослали электронную "
+#~ "почту:\n"
 #~ "\n"
 #~ "     gettor+zh at torproject.org\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 at torproject.org\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 at mit.edu>\"\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at googlemail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
-"Молимо Вас да одговорите на ову поруку преко адресе gettor at torproject.org, и\n"
+"Молимо Вас да одговорите на ову поруку преко адресе gettor at torproject.org, "
+"и\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -211,9 +186,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: Арапски\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Please reply to this mail (to gettor at torproject.org), 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -208,9 +180,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "gettor+ar at torproject.org: 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 at torproject.org\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 at torproject.org\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 at torproject.org"
+#~ "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 at torproject.org"
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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "Будь-ласка після вибору пакета надішліть лист на цю адресу\n"
-"gettor at torproject.org, та напишіть мені назву пакету програм десь на початку\n"
+"gettor at torproject.org, та напишіть мені назву пакету програм десь на "
+"початку\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -187,272 +157,159 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     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 at torproject.org:     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 at torproject.org\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 at yahoo.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 msgstr ""
 "\n"
 "اگر آپ کو کوئی سوالات ہیں ، یا یہ کام نہیں کرتا, آپ  ھیومن ریسورس سے اس ای "
-"میل ایڈریس پر رابطہ کر سکتے ہیں tor-assistants at torproject.org"
-"\n"
+"میل ایڈریس پر رابطہ کر سکتے ہیں tor-assistants at torproject.org\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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "براہ مہربانی مجھے اس  ای میل پر جواب ریں (togettor at torproject.org). کہیں بھی "
-"آپ کے ای میل میں ایک پیکیج کا نام. "
-"\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -206,419 +167,324 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "عربی میں gettor+ar at torproject.org جرمن میں gettor+de at torproject.orgانگریزی "
 "میں gettor+en at torproject.orgہسپانوی میں  gettor+es at torproject.orgفارسی "
-"(ایران) میں gettor+fa at torproject.orgفرانسیسی میں "
-"gettor+fr at torproject.orgاطالوی میں gettor+it at torproject.orgڈچ میں "
-"gettor+nl at torproject.orgپولینڈ میں gettor+pl at torproject.orgروشین میں "
-"gettor+ru at torproject.orgچینی میں gettor+zh at torproject.org"
-"\n"
+"(ایران) میں gettor+fa at torproject.orgفرانسیسی میں gettor+fr at torproject."
+"orgاطالوی میں gettor+it at torproject.orgڈچ میں gettor+nl at torproject.orgپولینڈ "
+"میں gettor+pl at torproject.orgروشین میں gettor+ru at torproject.orgچینی میں gettor"
+"+zh at torproject.org\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 at torproject.org\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 at torporject.org پرایک ای میل بیجھ کرپل حاصل کر "
-"سکتے ہیں ، جس میں لکھا ہو\"پل حاصل کرو\""
-"\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -145,273 +105,172 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at 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: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 at torproject.org\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 at torproject.org), và cho tôi biết\n"
+#~ "    Vui lòng trả lời thư này (đến gettor at torproject.org), 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 at torproject.org\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 at torproject.org:     Tiếng Nga\n"
 #~ "    gettor+zh at torproject.org:     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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 msgstr ""
 "\n"
 "    请回复此邮件(到 gettor at torproject.org),\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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -207,9 +181,7 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 "\n"
 "    gettor+ar at torproject.org:     阿拉伯语\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 at torproject.org\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 at torproject.org发送电子邮件以获取一个桥接,需要在正文中包含\"get bridges\"。\n"
+"你可以向这个地址:bridges at torproject.org发送电子邮件以获取一个桥接,需要在正"
+"文中包含\"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 at torproject.org\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 at torproject.org\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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org\n"
-"\n"
-"    "
+"If you have any questions or it doesn't work, you can contact a\n"
+"human at this support email address: tor-assistants at torproject.org"
 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 at torproject.org), and tell me\n"
-"    a single package name anywhere in the body of your email.\n"
-"\n"
-"    "
+"Please reply to this mail (to gettor at torproject.org), and tell me\n"
+"a single package name anywhere in the body of your email."
 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 at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
 "    gettor+en at torproject.org:     English\n"
@@ -146,270 +106,157 @@ msgid ""
 "    gettor+nl at torproject.org:     Dutch\n"
 "    gettor+pl at torproject.org:     Polish\n"
 "    gettor+ru at torproject.org:     Russian\n"
-"    gettor+zh at torproject.org:     Chinese\n"
-"\n"
-"    "
+"    gettor+zh at torproject.org:     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 at torproject.org\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 at appelbaum.net>, 
 #                            Christian Fromme <kaner at strace.org>
 #  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 at torproject.org), 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 at torproject.org:     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 at torproject.org"""),
@@ -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:





More information about the tor-commits mailing list