[tor-commits] [gettor/master] Add modified translation strings to .po files

kaner at torproject.org kaner at torproject.org
Sat Sep 3 12:35:54 UTC 2011


commit e1ac870c2aea76beee83b3411ad58351051b1790
Author: Christian Fromme <kaner at strace.org>
Date:   Sat Sep 3 13:57:10 2011 +0200

    Add modified translation strings to .po files
    Adapted the documentation to the new Transifex situation
---
 README.locale-spec-draft  |   14 +-
 i18n/.tx/config           |    2 +-
 i18n/af/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ak/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/am/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ar/gettor.po         |  416 +++++++++++++++++++++++++---------
 i18n/arn/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/ast/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/az/gettor.po         |  424 +++++++++++++++++++++++++---------
 i18n/be/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/bg/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/bms/gettor.po        |  564 ---------------------------------------------
 i18n/bn/gettor.po         |  417 +++++++++++++++++++++++++---------
 i18n/bn_IN/gettor.po      |  341 +++++++++++++++++++++-------
 i18n/bo/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/br/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/bs/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ca/gettor.po         |  417 +++++++++++++++++++++++++---------
 i18n/cs/gettor.po         |  346 +++++++++++++++++++++-------
 i18n/csb/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/cy/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/da/gettor.po         |  415 +++++++++++++++++++++++++---------
 i18n/de/gettor.po         |  425 +++++++++++++++++++++++++---------
 i18n/dz/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/el/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/en/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/eo/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/es/gettor.po         |  424 +++++++++++++++++++++++++---------
 i18n/et/gettor.po         |  346 +++++++++++++++++++++-------
 i18n/eu/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/fa/gettor.po         |  422 +++++++++++++++++++++++++---------
 i18n/fi/gettor.po         |  417 +++++++++++++++++++++++++---------
 i18n/fil/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/fo/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/fr/gettor.po         |  426 +++++++++++++++++++++++++---------
 i18n/fur/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/fy/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ga/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/gl/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/gu/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/gun/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/ha/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/he/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/hi/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/hr/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ht/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/hu/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/hy/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/id/gettor.po         |  418 +++++++++++++++++++++++++---------
 i18n/is/gettor.po         |  415 +++++++++++++++++++++++++---------
 i18n/it/gettor.po         |  378 +++++++++++++++++++++++--------
 i18n/ja/gettor.po         |  352 ++++++++++++++++++++++-------
 i18n/jv/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ka/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/km/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/kn/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ko/gettor.po         |  346 +++++++++++++++++++++-------
 i18n/ku/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/kw/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ky/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/lb/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/lg/gettor.po         |  271 ----------------------
 i18n/ln/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/lo/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/lt/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/lv/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/mg/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/mi/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/mk/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ml/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/mn/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/mr/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ms/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/mt/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/nah/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/nap/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/nb/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ne/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/nl/gettor.po         |  417 +++++++++++++++++++++++++---------
 i18n/nn/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/nso/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/oc/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/or/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/pa/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/pap/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/pl/gettor.po         |  417 +++++++++++++++++++++++++---------
 i18n/pms/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/ps/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/pt/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/pt_BR/gettor.po      |  346 +++++++++++++++++++++-------
 i18n/ro/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ru/gettor.po         |  420 +++++++++++++++++++++++++---------
 i18n/sco/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/sk/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/sl/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/so/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/son/gettor.po        |  341 +++++++++++++++++++++-------
 i18n/sq/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/sr/gettor.po         |  417 +++++++++++++++++++++++++---------
 i18n/st/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/su/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/sv/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/sw/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ta/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/te/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/templates/gettor.pot |  340 +++++++++++++++++++++-------
 i18n/tg/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/th/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/ti/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/tk/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/tr/gettor.po         |  384 +++++++++++++++++++++++--------
 i18n/uk/gettor.po         |  370 +++++++++++++++++++++++-------
 i18n/ur/gettor.po         |  402 ++++++++++++++++++++++++--------
 i18n/ve/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/vi/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/wa/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/wo/gettor.po         |  341 +++++++++++++++++++++-------
 i18n/zh_CN/gettor.po      |  408 ++++++++++++++++++++++++--------
 i18n/zh_HK/gettor.po      |  341 +++++++++++++++++++++-------
 i18n/zh_TW/gettor.po      |  341 +++++++++++++++++++++-------
 i18n/zu/gettor.po         |  341 +++++++++++++++++++++-------
 121 files changed, 31387 insertions(+), 10879 deletions(-)

diff --git a/README.locale-spec-draft b/README.locale-spec-draft
index c2243b1..ade531a 100644
--- a/README.locale-spec-draft
+++ b/README.locale-spec-draft
@@ -33,14 +33,6 @@ This will allow the user to interact without any knowledge of locales.
 GENERATING .po/.pot FILES
 -------------------------
 
-In the top level directory of the gettor source, run the following command:
-
-    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
-pootle web interface, choose gettor, choose 'admin', click each check box
-(ugh), click 'update languages' at the bottom. Then log into the pootle
-server and do an svn commit of all the new po files.
-
+Don't worry about generating .po files anymore. All that's needed for 
+Transifex to generate the .po files for us it to push the gettor .pot file
+to gettor.git's master branch.
diff --git a/i18n/.tx/config b/i18n/.tx/config
index d8e12d7..ae8da34 100644
--- a/i18n/.tx/config
+++ b/i18n/.tx/config
@@ -4,5 +4,5 @@ source_file = templates/gettor.pot
 source_lang = en
 
 [main]
-host = http://www.transifex.net
+host = https://www.transifex.net
 
diff --git a/i18n/af/gettor.po b/i18n/af/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/af/gettor.po
+++ b/i18n/af/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ak/gettor.po b/i18n/ak/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ak/gettor.po
+++ b/i18n/ak/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/am/gettor.po b/i18n/am/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/am/gettor.po
+++ b/i18n/am/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ar/gettor.po b/i18n/ar/gettor.po
index fc3f06a..44375fe 100644
--- a/i18n/ar/gettor.po
+++ b/i18n/ar/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"    مرحباً، هذا روبوت \"الحصول على تور\".\n"
+"\n"
+"    شكراً لطلبك.\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "    مرحباً، هذا روبوت \"الحصول على تور\".\n"
@@ -29,11 +36,11 @@ msgstr ""
 "    شكراً لطلبك.\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -43,7 +50,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -58,7 +65,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -72,20 +79,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"    ستحتاج أن ترسل باستخدام النص فقط plain text.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -98,11 +92,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "    سأرسل لك حزمة تور، إن أخبرتني أي واحدة تريد.\n"
@@ -110,11 +111,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "    يرجى الرد على هذه الرسالة (على gettor at torproject.org )، وأن تخبرني\n"
@@ -122,19 +123,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "    الحصول على نسخ مترجمة من تور\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "    لتحصل على نسخة تور مترجمة إلى لغتك، يرجى أن تحدد\n"
@@ -142,11 +147,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -156,7 +161,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -164,7 +169,7 @@ msgstr ""
 "    قائمة اللغات المدعومة:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -173,7 +178,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -203,7 +208,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -212,20 +217,21 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "    حزم أصغر حجماً    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "    إن كان عرض الحزمة لديك منخفضاً أو إذا كان مزود الخدمة الخاص بك لا يسمح \n"
@@ -235,15 +241,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"    فقط أدخل كلمة 'split' (بمعنى تقسيم) في جسم رسالتك الإلكترونية كالتالي:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -256,7 +263,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -268,7 +275,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -277,11 +284,12 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "    2- فك ضغظ جميع الملفات المنتهية بـ \"z.\" إن كنت قد حفظت جميع المرفقات "
@@ -290,7 +298,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -302,30 +310,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"    5- الآن استخدم برنامجاً يمكنه فك ضغط أرشيفات RAR متعددة. على ويندوز\n"
-"        يمكنك استخدام برنامج WinRAR. إذا لم يكن البرنامج منصباً\n"
-"        على جهازك، اذهب هنا:\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"        لفتح حزمة تور، ببساطة اضغط على ملف \"exe.\"\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -339,7 +331,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -348,14 +340,16 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -364,11 +358,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "    تلميح: إن كان كمبيوترك يحوي GnuPG منصباً، استخدم أداة\n"
@@ -376,20 +375,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "    المخرجات يجب أن تكون كالتالي:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "    إن لم تكن ذا دراية بأدوات سطر الأوامر، حاول البحث عن\n"
@@ -397,7 +401,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -417,11 +427,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "    يمكنك الحصول على جسر بإرسال رسالة إلكرونية تحوي \"\n"
@@ -430,7 +442,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -442,7 +454,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -460,7 +472,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -472,12 +484,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    شكراُ على طلبك. تم فهمه بنجاح. حالياً تتم\n"
@@ -486,11 +497,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "    إن لم تصل الحزمة، قد تكون أكبر مما يسمح به مزود البريد الإلكتروني "
@@ -501,7 +512,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -513,7 +524,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -522,6 +533,201 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"    يرجى الرد على هذه الرسالة (على gettor at torproject.org )، وأن تخبرني\n"
+"    اسم حزمة واحدة في أي مكان في جسم رسالتك.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    ستحتاج أن ترسل باستخدام النص فقط plain text.\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "    فقط أدخل كلمة 'split' (بمعنى تقسيم) في جسم رسالتك الإلكترونية "
+#~ "كالتالي:\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "        يمكنك استخدام برنامج WinRAR. إذا لم يكن البرنامج منصباً\n"
+#~ "        على جهازك، اذهب هنا:\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "        لفتح حزمة تور، ببساطة اضغط على ملف \"exe.\"\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/arn/gettor.po b/i18n/arn/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/arn/gettor.po
+++ b/i18n/arn/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ast/gettor.po b/i18n/ast/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ast/gettor.po
+++ b/i18n/ast/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/az/gettor.po b/i18n/az/gettor.po
index c885749..31b05e6 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"            Salam, Bu \"GetTor\" robotudur.\n"
+"\n"
+"            Sorğunuz üçün minnətdarıq.\n"
+"\n"
+"             "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "            Salam, Bu \"GetTor\" robotudur.\n"
@@ -31,11 +39,11 @@ msgstr ""
 "\n"
 "             "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -46,7 +54,7 @@ msgstr ""
 "\n"
 "                 "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -62,7 +70,7 @@ msgstr ""
 "\n"
 "                        "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -79,20 +87,7 @@ msgstr ""
 "\n"
 "                  "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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ə "
-"ya baza 64-dÉ™ proses  edÉ™ bilmirik\n"
-"                  poçtlar. Siz sadə mətni göndərməyə ehtiyac duyacaqsınız.\n"
-"\n"
-"            "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -106,11 +101,18 @@ msgstr ""
 " \n"
 "               "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "                 Əgər siz mənə hər hansısa istədiyinizi desəniz mən sizə Tor "
@@ -119,11 +121,11 @@ msgstr ""
 "\n"
 "                "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "                  Lütfən bu poçta (gettor at torproject.org-a) cavab verin və "
@@ -133,19 +135,23 @@ msgstr ""
 "\n"
 "           "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "               TOR-un MƏHDUDLAŞDIRILAN VERSİYALARINI ƏLDƏ ETMƏK\n"
 "               "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "               Sizin dilinizə tərcümə edilən Tor versiyasını almaq, müəyyən "
@@ -154,11 +160,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -167,21 +173,21 @@ msgstr ""
 "                 codes.\n"
 "\n"
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
 "\n"
 "                Dəstəklənmiş  yerlərin  siyahısı:\n"
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, 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/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -210,7 +216,7 @@ msgstr ""
 "gettor+zh at torproject.org: Çin\n"
 "\n"
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -219,20 +225,21 @@ msgstr ""
 "qəbul edəcəksiniz.\n"
 "\n"
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "                       SMALLER SIZED PACKAGES\n"
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "                   Əgər sizin bandwith-iniz aşağıdırsa və ya sizin "
@@ -245,15 +252,16 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"             Sadəcə elektron poçtunuzda haradasa  açar söz 'parçalanmasını'  "
-"özündə saxlayın daxil edin:\n"
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -265,7 +273,7 @@ msgstr ""
 "                             bir neçə 1,4MB əlavəsində Tor Səyyah Dəstəsi.\n"
 "\n"
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -277,7 +285,7 @@ msgstr ""
 "                     yenidən bir paketə.Bu aşağıdakı qaydada edilir:\n"
 "\n"
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -286,11 +294,12 @@ msgstr ""
 "saxlayın.\n"
 "               \n"
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "                    2). \".z-də\" qurtaran bütün fayllar zəncirbəndi açın. "
@@ -300,7 +309,7 @@ msgstr ""
 "\n"
 "                   "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -313,32 +322,14 @@ msgstr ""
 "\n"
 "          "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"        5). İndi proqramdan istifadə edin ki, unrar çoxcildli RAR-ı "
-"arxivləşdirir .\n"
-"             Windows-da , bu adətən WinRAR-dır. Əgər sizin \n"
-"              kompüterdə yüklənməyibsə, bunu buradan əldə edə bilərsiniz:\n"
-"\n"
-"       "
 
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"              Sizin Tor paketinizi açıb çıxartmaq üçün, \".exe\" faylını "
-"sadəcə iki dəfə klikləyin.\n"
-"\n"
-"             "
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -354,7 +345,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -364,14 +355,16 @@ msgstr ""
 "                \n"
 "                               "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -381,11 +374,16 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "          İşarə: Əgər sizin kompüterinizə GnuPG yüklənibsə, poçt indeksi "
@@ -395,20 +393,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "           Çıxış  buna bir qədər bənzəməlidir:\n"
 "\n"
 "          "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "                Əgər siz commandline alətləri ilə tanış deyilsinizsə,\n"
@@ -417,7 +420,13 @@ msgstr ""
 "\n"
 "         "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -439,11 +448,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "             Siz növbəti elektron poçt ünvanına elektron poçtun tərkibinə\n"
@@ -453,7 +464,7 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -466,7 +477,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -486,7 +497,7 @@ msgstr ""
 "\n"
 "                                 "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -499,12 +510,11 @@ msgstr ""
 "\n"
 "     "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) 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 "
@@ -515,11 +525,11 @@ msgstr ""
 "\n"
 "  "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "         Əgər gəlib çatmırsa, paket sizin poçt təchizatçınız üçün həddindən "
@@ -532,7 +542,7 @@ msgstr ""
 "\n"
 "       "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -545,7 +555,7 @@ msgstr ""
 "\n"
 "   "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -554,6 +564,206 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"                  Lütfən bu poçta (gettor at torproject.org-a) cavab verin və "
+"mənə deyin\n"
+"           ayrıca paket adı hardasa sizin poçt ünvanınızın bir "
+"hissəsindədir.\n"
+"\n"
+"           "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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É™ ya baza 64-dÉ™ proses  edÉ™ bilmirik\n"
+#~ "                  poçtlar. Siz sadə mətni göndərməyə ehtiyac "
+#~ "duyacaqsınız.\n"
+#~ "\n"
+#~ "            "
+
+#, 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "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-ı "
+#~ "arxivləşdirir .\n"
+#~ "             Windows-da , bu adətən WinRAR-dır. Əgər sizin \n"
+#~ "              kompüterdə yüklənməyibsə, bunu buradan əldə edə "
+#~ "bilərsiniz:\n"
+#~ "\n"
+#~ "       "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "              Sizin Tor paketinizi açıb çıxartmaq üçün, \".exe\" faylını "
+#~ "sadəcə iki dəfə klikləyin.\n"
+#~ "\n"
+#~ "             "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/be/gettor.po b/i18n/be/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/be/gettor.po
+++ b/i18n/be/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/bg/gettor.po b/i18n/bg/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/bg/gettor.po
+++ b/i18n/bg/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/bms/gettor.po b/i18n/bms/gettor.po
deleted file mode 100644
index 3e45e5f..0000000
--- a/i18n/bms/gettor.po
+++ /dev/null
@@ -1,564 +0,0 @@
-# GetTor pot file
-# Copyright (C) 2009
-# This file is distributed under the same license as the GetTor package.
-# Jacob Appelbaum <jacob at appelbaum.net>, 2009
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+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/i18n.py:408
-#, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
-msgstr ""
-"\n"
-"    မဂၤလာပါ \"GetTor\" robot ျဖစ္ပါတယ္။\n"
-"\n"
-"    သင္၏ေတာင္းဆိုမႈအတြက္ ေက်းဇူးတင္ပါတယ္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:412
-#, fuzzy
-msgid ""
-" Unfortunately, we won't answer you 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"
-"                ၎အေကာင့္တစ္ခုခုျဖင့္\n"
-"    ေပးပို႔ေပးပါ။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:416
-#, fuzzy
-msgid ""
-"We only process requests from email services that support \"DKIM\",\n"
-"which 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"
-"      အီးေမးလ္ feature တစ္ခု ျဖစ္ေသာ  \"DKIM\" ကို\n"
-"     အေထာက္ကူေပးသည့္ အီးေမးလ္ဝန္ေဆာင္မႈမ်ား ဆီမွ ေတာင္းဆိုမ်ားကိုသာ လုပ္ေဆာင္ေပးပါသည္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:420
-#, fuzzy
-msgid ""
-"(We apologize if you didn't ask for this mail. Since your email is from\n"
-"a service that doesn'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"
-"    ေနာက္တစ္ေန႔ သို႔မဟုတ္ ထို႔ထက္ၾကာလွ်င္ေတာ့ ယင္းအီးေမးလ္လိပ္စာကို လစ္လ်ဴရႈလိုက္မွာ ျဖစ္ပါတယ္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"   သင့္အေနနဲ႔ စာသားသက္သက္ျဖင့္ ေပးပို႔ရန္ လိုအပ္ပါတယ္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
-#, fuzzy
-msgid ""
-"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"
-"    "
-
-#: lib/gettor/i18n.py:430
-#, fuzzy
-msgid ""
-"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"
-"    ေအာက္ပါ packages နာမည္မ်ားထဲမွ တစ္ခုကို ေရြးခ်ယ္ပါ။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:433
-#, fuzzy
-msgid ""
-"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"
-"    အီးေမးလ္၏ စာကိုယ္ထဲမွာပဲ ျဖစ္ျဖစ္ package တစ္ခုရဲ႕ နာမည္ကို ေျပာျပေပးပါ။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:436
-#, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
-msgstr ""
-"\n"
-"     သင္၏ နယ္ပယ္ေဒသဆိုင္ရာ TOR ဗားရွင္းကို ရယူျခင္း\n"
-"    "
-
-#: lib/gettor/i18n.py:438
-#, fuzzy
-msgid ""
-"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"
-"    "
-
-#: lib/gettor/i18n.py:441
-#, fuzzy
-msgid ""
-"This 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"
-"   ေထာက္အကူေပးေသာ ဘာသာစကားကုဒ္မ်ား စာရင္းကို \n"
-"   ေအာက္တြင္ စစ္ေဆးၾကည့္ပါ။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:445
-#, fuzzy
-msgid " List of supported locales:"
-msgstr ""
-"\n"
-"    အေထာက္အကူေပးေသာ နယ္ပယ္ေဒသမ်ား စာရင္း:\n"
-"    "
-
-#: lib/gettor/i18n.py:447
-#, fuzzy
-msgid "Here is a list of all available languages:"
-msgstr ""
-"\n"
-"   ရရွိႏိုင္ေသာ ဘာသာစကားမ်ား စာရင္းျဖစ္ပါတယ္။:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:449
-#, fuzzy
-msgid ""
-"    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"
-msgstr ""
-"\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"
-"    "
-
-#: lib/gettor/i18n.py:461
-#, fuzzy
-msgid "If you select no language, you will receive the English version."
-msgstr ""
-"\n"
-"    အကယ္၍ ဘာ ဘာသာစကားမွ မေရြးခ်ယ္ခဲ့လွ်င္ သင္ဟာ အဂၤလိပ္ဗားရွင္းကို လက္ခံရရွိမွာ ျဖစ္ပါတယ္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:463
-#, fuzzy
-msgid "SMALLER SIZED PACKAGES"
-msgstr ""
-"\n"
-"    PACKAGE ဆိုက္ဒ္အေသးမ်ား\n"
-"    "
-
-#: lib/gettor/i18n.py:465
-#, fuzzy
-msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is 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"
-"    အရြယ္အစားအၾကီးတစ္ခု အစား \n"
-"    အရြယ္အစားအေသးေလးေတြ ခြဲျပီး ေပးပို႔ေအာင္ ျပဳလုပ္လို႔ရပါတယ္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
-msgstr ""
-"\n"
-"   ဤကဲ့သို႔ သင္၏ ေမးလ္တြင္ keyword ျဖစ္တဲ့ 'split' ဆိုတဲ့ စကားလံုးပါဝင္မွာပါ။:\n"
-"    "
-
-#: lib/gettor/i18n.py:472
-#, fuzzy
-msgid ""
-"Sending this 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"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:475
-#, fuzzy
-msgid ""
-"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"
-"    ေအာက္ေဖာ္ျပပါအတိုင္း ျပီးေျမာက္မွာ ျဖစ္ပါတယ္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:478
-#, fuzzy
-msgid "1.) Save all received attachments into one folder on your disk."
-msgstr ""
-"\n"
-"     ၁.)လက္ခံရရွိျပီးသား attachment အားလံုးကို folder တစ္ခုထဲတြင္ သိမ္းထားရပါမယ္။\n"
-"    \n"
-"    "
-
-#: lib/gettor/i18n.py:480
-#, fuzzy
-msgid ""
-"2.) 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 လုပ္ပါ။ အကယ္၍ attachment အားလံုးကို "
-"သိမ္းျပီးျပီဆိုရင္    folder အသစ္တစ္ခုအရင္လုပ္ ျပီးရင္ အဲ့ဒိထဲမွာ ဖိုင္ေတြအားလံုးကို ရိုးရိုးရွင္းရွင္းပဲ unzip "
-"ျပဳလုပ္ရမွာပါ။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:483
-#, fuzzy
-msgid ""
-"3.) Verify all files as described in the mail you received with \n"
-"each package. (gpg --verify)"
-msgstr ""
-"\n"
-"    ၄.)package တစ္ခုခ်င္းစီႏွင့္အတူ \n"
-"        လက္ခံရရွိေသာ အီးေမးလ္တြင္ ေဖာ္ျပထားေသာ ဖိုင္မ်ားကို မွန္မမွန္စစ္ေဆးပါ။(gpg --verify)\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:486
-#, fuzzy
-msgid ""
-"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"
-"          Windows မ်ားေပၚတြင္ေတာ့ ထံုးစံအတုိင္း WinRAR ရွိပါတယ္။\n"
-"          အကယ္၍ သင့္ကြန္ျပဴတာမွာ install မလုပ္ရေသးဘူး ဆိုရင္ေတာ့ ဒီမွာ ရယူပါ :\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"         Tor package မ်ားကို ျပန္ျဖည္ရန္ အရိုးရွင္းဆံုးကေတာ့ \".exe\" ဖိုင္ကို ကလစ္၂ခ်က္ႏွိပ္ပါ။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:492
-#, fuzzy
-msgid ""
-"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"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:496
-#, fuzzy
-msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
-msgstr ""
-"\n"
-"    ၇.) ဒီေလာက္ပါပဲ ျပီးသြားပါျပီ။ Tor ကိုအသံုးျပဳတဲ့အတြက္ ေက်းဇူးတင္ပါတယ္။ ေပ်ာ္ရႊင္ပါေစ!"
-"\\    \n"
-"    "
-
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
-msgstr ""
-
-#: lib/gettor/i18n.py:503
-#, fuzzy
-msgid ""
-" 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"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:506
-#, fuzzy
-msgid ""
-"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/i18n.py:509
-#, fuzzy
-msgid "The output should look somewhat like this:"
-msgstr ""
-"\n"
-"    output သည္ အနည္းငယ္ ဤကဲ့သို႔  ျဖစ္သင့္သည္။:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:511
-#, fuzzy
-msgid ""
-"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"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:514
-#, fuzzy
-msgid ""
-"If your Internet connection blocks access to the Tor network, you\n"
-"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"are Tor relays that aren't listed in the main directory. Since there\n"
-"is no complete public list of them, even if 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"
-"     bridge relay ကိုလိုအပ္မည္ ျဖစ္သည္။ \n"
-"     Bridge realays (သို႔မဟုတ္ အတိုေကာက္ \"bridges\") မ်ားသည္\n"
-"     အဓိက လမ္းညႊန္ထဲတြင္ မပါဝင္ေပ။ ၎တို႔၏ အမ်ားသူငါဆိုင္ရာ စာရင္းသည္ မျပည့္စံုပါ။ \n"
-"     အကယ္၍ သင္၏ ISP က သိႏိုင္ေသာ Tor relays မ်ားသို႔ ဆက္သြယ္မႈေတြကို စီစစ္ထားတယ္ ဆိုရင္ေတာင္ \n"
-"     bridge ေတြအားလံုးကို ပိတ္ဆို႔ႏိုင္ဖို႔ မျဖစ္ႏုိင္ပါဘူး။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:521
-#, fuzzy
-msgid ""
-"You 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"
-"    ေအာက္ေဖာ္ျပပါ အီးေမးလ္ကို ပို႔ေပးပါ။\n"
-"    bridges at torproject.org\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:524
-#, fuzzy
-msgid ""
-"It is also possible to fetch bridges with a web browser at the following\n"
-"url: https://bridges.torproject.org/"
-msgstr ""
-"\n"
-"    ေအာက္ေဖာ္ျပပါ လိပ္စာတြင္လည္း bridges မ်ားကို ရယူႏိုင္ပါေသးတယ္။\n"
-"    url: https://bridges.torproject.org/\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:527
-#, fuzzy
-msgid ""
-"IMPORTANT NOTE:\n"
-"Since this is part of a split-file request, you need to wait for\n"
-"all split files to be 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"
-"    "
-
-#: lib/gettor/i18n.py:533
-#, fuzzy
-msgid ""
-"Packages might arrive out of order! Please make sure you received\n"
-"all packages before you attempt to unpack them!"
-msgstr ""
-"\n"
-"    Packages မ်ားသည္ အစီစဥ္မက် ထြက္လာလိမ့္မည္။\n"
-"    unpack မလုပ္မွီ package အားလံုး ရမရ ေသခ်ာေအာင္ လုပ္ပါ။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:536
-#, fuzzy
-msgid ""
-"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"
-"    သင္၏ package ဟာ ေနာက္ ၁၀မိနစ္အတြင္း ေရာက္ရွိလာသင့္ပါတယ္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:540
-#, fuzzy
-msgid ""
-"If it 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"
-"    gmail.com သို႔မဟုတ္ yahoo.cn account ျဖင့္ ျပန္ပို႔ၾကည့္ေပးပါ။\n"
-"    tor-im-browser-bundle ထက္ tor-browser-bundle ကို ေမးၾကည့္ပါ \n"
-"    ၎က ပိုမိုေသးငယ္ပါတယ္။\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:543
-#, fuzzy
-msgid ""
-"Unfortunately we 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"
-"    "
-
-#: lib/gettor/i18n.py:546
-msgid ""
-"Unfortunately there is no split package available for the package you\n"
-"requested. Please send us another package name or request the same package \n"
-"again, but remove the 'split' keyword. In that case we'll send you the "
-"whole \n"
-"package. Make sure this is what you want."
-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"
-#~ "     ၃.) \".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 43ba036..6ab5ebf 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"হ্যালো, এটি \"গেটটর\" রবোট। \n"
+"\n"
+"আপনার অনুরোধের জন্যে ধন্যবাদ।\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "হ্যালো, এটি \"গেটটর\" রবোট। \n"
@@ -31,11 +39,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -45,7 +53,7 @@ msgstr ""
 "\n"
 " "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -60,7 +68,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -75,19 +83,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"প্রক্রিয়াজাত করতে পারব না। আপনাকে শুধু টেক্সটের মাধ্যমে বার্তাটি পাঠাতে হবে।\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -99,11 +95,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "আমি আপনাকে একটি টর প্যাকেজ পাঠাব, যদি আপনি বলতে পারেন যে ঠিক কোনটি আপনি চান।\n"
@@ -111,11 +114,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "অনুগ্রহ করে এই ঠিকানায় জবাব পাঠান (প্রতি gettor at torproject.org), এবং আমাকে "
@@ -124,19 +127,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "টরের অনুবাদিত সংস্করণগুলো পাওয়ার উপায়\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "আপনার পছন্দের ভাষায় অনুবাদ করার জন্যে টরের একটি সংস্করণ নির্দিষ্ট করুন\n"
@@ -144,11 +151,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -159,7 +166,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -167,7 +174,7 @@ msgstr ""
 "আমরা যেসব ভাষায় প্যাকেজটি দিয়ে থাকি:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -176,7 +183,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -206,7 +213,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -215,21 +222,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "ছোট সাইজের প্যাকেজ\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "আপনার ব্যান্ডউইদথ (ইন্টারনেটের গতি) যদি কম থাকে অথবা আপনার আইএসপি আপনাকে\n"
@@ -240,15 +248,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"শুধুমাত্র 'split' (স্প্লিট) এই কিওয়ার্ডটি আপনার ইমেইলে যোগ করে দিন এভাবে:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -259,7 +268,7 @@ msgstr ""
 "এটি আপনাকে টর ব্রাউজার বান্ডেল ১.৪ মেগাবাইটের সংযুক্তির আকারে পাঠাবে।\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -271,7 +280,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -280,11 +289,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "২) যেসব ফাইলের শেষে \".z\" আছে সেগুলোকে আনজিপ করুন। আপনি যদি সব অ্যটাচমেন্ট সেইভ "
@@ -293,7 +303,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -305,31 +315,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"৫) এখন একটি প্রোগ্রাম ব্যবহার করুন যা রার আর্কাইভ থেকে ফাইলগুলোকে সম্প্রসারিত করতে "
-"সাহায্য করবে।\n"
-"উইন্ডোজে এটির নাম সাধারণত উইনরার। আপনার যদি তা না থাকে\n"
-"ইনস্টল করা তাহলে তা এখান থেকে ডাউনলোড করুন:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"আপনার টর প্যাকেজটি খোলার জন্যে শুধু \".exe\" ফাইলটি ডাবলক্লিক করুন।\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -343,7 +336,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -352,14 +345,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -369,11 +364,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "ইঙ্গিত: আপনার কম্পিউটারে যদি জিএনইউপিজি ইনস্টল করা থাকে, তাহলে ব্যবহার করুন "
@@ -382,20 +382,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "এর আউটপুটটি এরকম দেখাবে হয়ত:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "আপনার যদি কমান্ডলাইন টুল সম্পর্কে জানা না থাকে তাহলে চেষ্টা করুন খুঁজতে\n"
@@ -403,7 +408,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -423,11 +434,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "আপনি একটি ব্রিজকে অধিগ্রহণ করতে পারবেন একটি ইমেইল পাঠিয়ে যাতে লেখা থাকবে \"get "
@@ -437,7 +450,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -449,7 +462,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -467,7 +480,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -479,12 +492,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "ধন্যবাদ আপনার অনুরোধের জন্যে। এটি ভালভাবে বোঝা গেছে। আপনার অনুরোধ\n"
@@ -493,11 +505,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "এটি যদি না আসে, এই প্যাকেজটি আপনার আইএসপির জন্যে খুব বড় হয়ে গেছে।\n"
@@ -507,7 +519,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -520,7 +532,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -529,6 +541,201 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"অনুগ্রহ করে এই ঠিকানায় জবাব পাঠান (প্রতি gettor at torproject.org), এবং আমাকে "
+"জানান\n"
+"শুধু একটি প্যাকেজের নাম যা আপনার মেইলের মূল অংশের যে কোন যায়গায় থাকলেই হবে।\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "প্রক্রিয়াজাত করতে পারব না। আপনাকে শুধু টেক্সটের মাধ্যমে বার্তাটি পাঠাতে হবে।\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "শুধুমাত্র 'split' (স্প্লিট) এই কিওয়ার্ডটি আপনার ইমেইলে যোগ করে দিন এভাবে:\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "আপনার টর প্যাকেজটি খোলার জন্যে শুধু \".exe\" ফাইলটি ডাবলক্লিক করুন।\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/bn_IN/gettor.po b/i18n/bn_IN/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/bn_IN/gettor.po
+++ b/i18n/bn_IN/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/bo/gettor.po b/i18n/bo/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/bo/gettor.po
+++ b/i18n/bo/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/br/gettor.po b/i18n/br/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/br/gettor.po
+++ b/i18n/br/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/bs/gettor.po b/i18n/bs/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/bs/gettor.po
+++ b/i18n/bs/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ca/gettor.po b/i18n/ca/gettor.po
index 9bec735..56fe01f 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"Hola, Això es el robot \"GetTor\".\n"
+"\n"
+"Gracies per la teva peticiò.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Hola, Això es el robot \"GetTor\".\n"
@@ -31,11 +39,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -46,7 +54,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -61,7 +69,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -75,20 +83,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"Et suggerim enviar emails de texte.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -100,11 +95,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "T'enviarem el pack Tor, si ens indiques quin vols.\n"
@@ -112,11 +114,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Siusplau respon a aquest email (to gettor at torproject.org), indicant\n"
@@ -124,19 +126,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "OBTENINT VERSIONS LOCALITZADES DE TOR\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "Per obtenir una versió de Tor en la teva llengua, especifica \n"
@@ -144,11 +150,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -157,7 +163,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -165,7 +171,7 @@ msgstr ""
 "Llista de locals suportades:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -174,7 +180,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -204,7 +210,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -213,21 +219,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "PAQUETS DE MIDA REDUÏDA\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "Si el teu ample de banda es baix o el teu proveidor no et permet \n"
@@ -237,15 +244,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"Sencillament inclou la paraula 'split' en algún lloc del teu email:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -257,7 +265,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -269,7 +277,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -278,11 +286,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2.) Descomprimeix tots els arxius acabats en \".z\".Si anteriorment has "
@@ -292,7 +301,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -304,30 +313,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"5.)Utilitza una aplicació que pugui descomprimir arxius RAR multivolum. A \n"
-"Windows, normalment es WinRAR.Si no el tens instalat\n"
-"en el teu ordinador, el tens disponible aqui:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, 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/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -341,7 +334,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -350,14 +343,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -367,11 +362,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "Nota: Si el teu ordinador te GnuPG instal·lat, utilitza l'eina gpg\n"
@@ -379,20 +379,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "La sortida te de semblar alguna cosa semblant a :\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "Si no estas familiaritzat amb els comanaments en linia, prova alguna\n"
@@ -400,7 +405,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -420,11 +431,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "Pots adquirir un pont enviant un email amb la frase \"get bridges\"\n"
@@ -433,7 +446,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -445,7 +458,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -462,7 +475,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -474,12 +487,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Gracies per la teva petició. Ha quedat tot entès. La petició\n"
@@ -489,11 +501,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "Si no t'arriba,podria ser que el paquet fos massa gran pel teu proveidor de "
@@ -504,7 +516,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -516,7 +528,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -525,6 +537,201 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"Siusplau respon a aquest email (to gettor at torproject.org), indicant\n"
+"un unic pack en qualsevol lloc del cos del missatge.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "Et suggerim enviar emails de texte.\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "Windows, normalment es WinRAR.Si no el tens instalat\n"
+#~ "en el teu ordinador, el tens disponible aqui:\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/cs/gettor.po b/i18n/cs/gettor.po
index 6e4d3e7..65bcbae 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,20 @@ 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/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"Dobrý den, to je  \"GetTor\" robot.\n"
+"\n"
+"Děkujeme za Váš dotaz.\n"
 "\n"
-"Thank you for your request."
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Dobrý den, to je  \"GetTor\" robot.\n"
@@ -31,77 +39,82 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -116,103 +129,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -222,19 +256,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -243,32 +279,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -276,3 +312,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/csb/gettor.po b/i18n/csb/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/csb/gettor.po
+++ b/i18n/csb/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/cy/gettor.po b/i18n/cy/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/cy/gettor.po
+++ b/i18n/cy/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/da/gettor.po b/i18n/da/gettor.po
index cbb05b8..8948567 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"Hej, dette er \"GetTor\" robotten.\n"
+"\n"
+"Tak for din forespørgsel.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Hej, dette er \"GetTor\" robotten.\n"
@@ -31,11 +39,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -44,7 +52,7 @@ msgstr ""
 "disse.\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -58,7 +66,7 @@ msgstr ""
 "er den faktiske afsender af mailen.\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -73,19 +81,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"Du er nød til at sende som ren tekst (plain text).\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -98,11 +94,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "Jeg vil emaile dig en Tor pakke, hvis du fortæller mig hvilken du vil have.\n"
@@ -110,11 +113,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Besvar venligst denne email (til gettor at torproject.org), og angiv navnet\n"
@@ -122,19 +125,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "FÃ… OVERSATTE VERSIONER AF TOR\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "Send en email til den specifikke emailadresse for dit sprog, for at få en\n"
@@ -142,11 +149,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -155,7 +162,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -163,7 +170,7 @@ msgstr ""
 "Liste af supporterede oversættelser:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -172,7 +179,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -202,7 +209,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -211,21 +218,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "MINDRE PAKKER (STØRRELSE)\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "Hvis din båndbredde er lille, eller din udbyder ikke tillader dig at "
@@ -236,15 +244,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"Inkluder nøgleordet 'split' et eller andet sted i din email, som her:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -256,7 +265,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -268,7 +277,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -277,11 +286,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2.) Unzip alle filer der ender med \".z\". Hvis du gemte alle "
@@ -290,7 +300,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -302,30 +312,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"5.) Brug et program der kan udpakke multivolume RAR arkiver. PÃ¥\n"
-"Windows er dette typisk WinRAR. Hvis du ikke har dette installeret\n"
-"på din computer, kan du hente det her:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, 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/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -339,7 +333,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -348,14 +342,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -364,11 +360,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "Tip: Hvis din computer har GnuPG installeret, kan du bruge gpg "
@@ -377,20 +378,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "Resultatet burde være nogenlunde som dette:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "Hvis du ikke føler dig hjemme i kommandolinie-værktøjer, kan du\n"
@@ -398,7 +404,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -418,11 +430,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "Du kan forespørge om en bridge ved at sende en email, der indeholder\n"
@@ -431,7 +445,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -443,7 +457,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -461,7 +475,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -473,12 +487,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Tak for din forespørgsel. Den var forstået uden problemer. Din forespørgsel\n"
@@ -487,11 +500,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "Hvis den ikke ankommer er pakken måske for stor til din emailudbyder.\n"
@@ -501,7 +514,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -514,7 +527,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -523,6 +536,200 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"Besvar venligst denne email (til gettor at torproject.org), og angiv navnet\n"
+"på den pakke du vil have et eller andet sted i teksten i emailen.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "Du er nød til at sende som ren tekst (plain text).\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "Windows er dette typisk WinRAR. Hvis du ikke har dette installeret\n"
+#~ "på din computer, kan du hente det her:\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/de/gettor.po b/i18n/de/gettor.po
index 703bf39..af84579 100644
--- a/i18n/de/gettor.po
+++ b/i18n/de/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"    Hallo, dies ist der \"GetTor\"-Robot.\n"
 "\n"
-"Thank you for your request."
+"    Danke für Ihre Anfrage.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "    Hallo, dies ist der \"GetTor\"-Robot.\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -43,7 +51,7 @@ msgstr ""
 "    eine E-Mail senden.\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -58,7 +66,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -74,19 +82,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"    Sie müssen uns reinen Text senden.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -100,11 +96,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "    Ich werden Ihnen ein Torpaket zumailen, wenn Sie mir sagen können, "
@@ -113,11 +116,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "    Bitte antworten Sie auf diese E-mail (an gettor at torproject.org), und "
@@ -127,19 +130,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "    ÃœBERSETZTE VERSIONEN VON TOR ERHALTEN\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "    Um eine übersetzte Version von Tor in Ihrer Sprache zu erhalten, geben "
@@ -148,11 +155,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -162,7 +169,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -170,7 +177,7 @@ msgstr ""
 "    Liste der unterstützten Sprachen:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -179,7 +186,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -209,7 +216,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -219,17 +226,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "    Wenn Ihre Bandbreite gering ist, oder Ihr Anbieter keine grossen\n"
@@ -239,16 +247,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"    Schreiben SIe dazu einfach das Schlüsselwort 'split' an irgendeine "
-"Stelle in Ihrer E-mail, z.B. so:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -262,7 +270,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -274,7 +282,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -284,11 +292,12 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "    2.) Entpacken Sie alle Zip-Dateien mit der Endung \".z\". Sollten Sie "
@@ -298,7 +307,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -310,33 +319,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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.) 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 "
-"herunterladen:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"        Um das Torpaket zu entpacken, doppelklicken Sie einfach auf die \"."
-"exe\" Datei.\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -350,7 +340,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -360,14 +350,16 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -377,11 +369,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "    Tipp: Wenn Sie GnuPG auf Ihrem Computer installiert haben, benutzen\n"
@@ -389,20 +386,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "    Die Ausgabe sollte ungefähr wie folgt aussehen:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "    Sollten Sie mit Befehlszeilen nicht vertraut sein, können Sie auf\n"
@@ -410,7 +412,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -433,11 +441,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "    Sie können Zugang zu einem Brücken-Server erhalten, indem Sie eine E-"
@@ -447,7 +457,7 @@ msgstr ""
 " \n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -460,7 +470,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -478,7 +488,7 @@ msgstr ""
 "    entpackt werden können.\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -491,12 +501,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Vielen Dank für Ihre Anfrage. Diese wurder erfolgreich interpretiert und "
@@ -506,11 +515,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "    Sollte es nicht ankommen, ist das Paket eventuell zu gross für Ihren E-"
@@ -522,7 +531,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -534,7 +543,7 @@ msgstr ""
 "    während wir versuchen das Problem in den Griff zu bekommen.\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -542,3 +551,203 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+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"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    Sie müssen uns reinen Text senden.\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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.) 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 "
+#~ "herunterladen:\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "\n"
+#~ "    "
diff --git a/i18n/dz/gettor.po b/i18n/dz/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/dz/gettor.po
+++ b/i18n/dz/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/el/gettor.po b/i18n/el/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/el/gettor.po
+++ b/i18n/el/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/en/gettor.po b/i18n/en/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/en/gettor.po
+++ b/i18n/en/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/eo/gettor.po b/i18n/eo/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/eo/gettor.po
+++ b/i18n/eo/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/es/gettor.po b/i18n/es/gettor.po
index f684e59..93fdc63 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"Hola, este es el robot \"GetTor\".\n"
+"\n"
+"Gracias por su petición.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Hola, este es el robot \"GetTor\".\n"
@@ -31,11 +39,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -45,7 +53,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -61,7 +69,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -78,20 +86,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"64.\n"
-"Necesitará enviar texto plano.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -104,11 +99,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "Le enviaré un correo con el paquete Tor, si me dice cuál es el que quiere.\n"
@@ -116,11 +118,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Por favor, responda este correo (a gettor at torproject.org) y mencione\n"
@@ -128,19 +130,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "OBTENIENDO VERSIONES LOCALIZADAS DE TOR\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "Para obtener una versión de Tor traducida a su lenguaje, especifique el\n"
@@ -148,11 +154,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -162,7 +168,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -170,7 +176,7 @@ msgstr ""
 "Lista de los idiomas soportados:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -179,7 +185,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -209,7 +215,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -218,21 +224,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "PAQUETES MÁS PEQUEÑOS\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "Si su ancho de banda es baja o su proveedor no le permite recibir archivos\n"
@@ -244,16 +251,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"Simplemente incluya la palabra clave 'split' en algún lugar en su email,\n"
-"como por ejemplo:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -266,7 +273,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -278,7 +285,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -288,11 +295,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2) Descomprima todos los archivos que terminan en \".z\". Si ha guardado "
@@ -304,7 +312,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -317,32 +325,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"5) Ahora utilice un programa que pueda descomprimir archivos RAR múltiples.\n"
-"En Windows\n"
-"usualmente es WinRAR. Si no lo tiene instalado en su ordenador, puede\n"
-"obtenerlo aquí:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, 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"
-"archivo \".exe\"\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -358,7 +348,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -367,14 +357,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -385,11 +377,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "Consejo: Si su ordenador tiene instalado GnuGP, utilice el comando gpg como\n"
@@ -398,20 +395,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "El resultado debería ser algo como esto:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "Si usted no está familiarizado con herramientas de línea de comandos,\n"
@@ -420,7 +422,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -445,11 +453,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "    Usted puede adquirir un puente mediante el envío de un correo\n"
@@ -461,7 +471,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -474,7 +484,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -494,7 +504,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -507,12 +517,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Gracias por su petición. Quedó entendido correctamente. Su solicitud "
@@ -522,11 +531,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "    Si no llega, el paquete podría ser demasiado grande para su proveedor de "
@@ -538,7 +547,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -552,7 +561,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -561,6 +570,205 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"Por favor, responda este correo (a gettor at torproject.org) y mencione\n"
+"el nombre del paquete en cualquier parte del cuerpo de su correo.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "64.\n"
+#~ "Necesitará enviar texto plano.\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "En Windows\n"
+#~ "usualmente es WinRAR. Si no lo tiene instalado en su ordenador, puede\n"
+#~ "obtenerlo aquí:\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "archivo \".exe\"\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/et/gettor.po b/i18n/et/gettor.po
index 39b6865..bc6b34a 100644
--- a/i18n/et/gettor.po
+++ b/i18n/et/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"Tere, tegu on \"Hangi Tor\" robotiga.\n"
+"\n"
+"Täname päringu eest.\n"
 "\n"
-"Thank you for your request."
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Tere, tegu on \"Hangi Tor\" robotiga.\n"
@@ -30,77 +38,82 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -115,103 +128,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -221,19 +255,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -242,32 +278,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -275,3 +311,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/eu/gettor.po b/i18n/eu/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/eu/gettor.po
+++ b/i18n/eu/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/fa/gettor.po b/i18n/fa/gettor.po
index ddec981..d31d176 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"سلام،من پاسخگوی خودکار دریافت تُر هستم.\n"
+"\n"
+"از درخواست شما سپاسگذاریم.\n"
+"\n"
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "سلام،من پاسخگوی خودکار دریافت تُر هستم.\n"
@@ -30,11 +37,11 @@ msgstr ""
 "از درخواست شما سپاسگذاریم.\n"
 "\n"
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -42,7 +49,7 @@ msgstr ""
 "GMAIL.COMn\\ و يا درYAHOO.CN باز کنيد و از يکی از اين حساب های کاربری با ما n"
 "\\مکاتبه کنيدn\\    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -58,7 +65,7 @@ msgstr ""
 " \n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -75,18 +82,7 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -98,11 +94,18 @@ msgstr ""
 "د\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "اگر توضیح بدهید که کدام یک از بسته های اطلاعاتی Tor مورد نیاز شماست، من آن\n"
@@ -111,11 +114,11 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "لطفن به این ایمیل (gettor at torproject.rog)پاسخی ارسال کنید و نام یک بسته ی\n"
@@ -123,20 +126,24 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "دریافت نمونه های محلی TOR\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "برای دریافت ترجمه ای از Tor به زبان مورد نظر شما، لطفن زبان مذکور و آدرسی "
@@ -145,11 +152,11 @@ msgstr ""
 " \n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -158,7 +165,7 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -167,7 +174,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -176,7 +183,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -206,7 +213,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -216,22 +223,23 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "بسته های اطلاعاتی کوچک-تر\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "اگر پهنای باند شما به کم است و یا سرویس دهنده اجازه ی دریافت ایمیل با ضمیمه\n"
@@ -242,18 +250,16 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"تنها کاری که لازم است انجام دهید این است که کلمه کلیدی \"split\" را در جایی "
-"در\n"
-" بدنه ایمیل خود، به این صورت، قرار دهید\n"
-":\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -264,7 +270,7 @@ msgstr ""
 " Tor ارسال خواهد شد.\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -276,7 +282,7 @@ msgstr ""
 ":\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -285,11 +291,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 ".(تمام پرونده های زیپ شده را که به z ختم می شوند، دوباره جداسازی (unzip)\n"
@@ -298,7 +305,7 @@ msgstr ""
 " \n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -310,31 +317,14 @@ msgstr ""
 ")\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"5.) حالا از برنامه ای استفاده کنید که آرشیوهای چندبخشی RAR را از وضعیت rar\n"
-" خارج می کند. اگر این برنامه را روی کامپیوتر خود نصب نکرده اید، از اینجا می\n"
-" توانید دریافت کنید:\n"
-" \n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"برای پیاده-سازی بسته ی Tor خود، کافی است روی پرونده ی \".exe\" دوبار کلیک\n"
-" کنید\n"
-".\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -347,7 +337,7 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -357,14 +347,16 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -373,11 +365,16 @@ msgstr ""
 " \n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "اشاره: اگر GnuPG روی کامپیوتر شما نصب شده است، از عبارت فرمانی gpg به "
@@ -386,20 +383,25 @@ msgstr ""
 ".\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "نتیجه نهایی باید چیزی شبیه به این باشد:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "اگر با ابزار فرمانی آشنایی ندارید، روی اینترنت به دنبال یک کاربر گرافیکی\n"
@@ -407,7 +409,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -428,11 +436,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "با ارسال یک ایمیل به آدرس: bridges at torproject.org که کلمه ی \"get bridge\" "
@@ -441,7 +451,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -452,7 +462,7 @@ msgstr ""
 "كنيد/n\\url: https://bridges.torproject.org//n\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -467,7 +477,7 @@ msgstr ""
 "کنيد  و با دوکليک روی فایل اول، همه را با هم پياده-سازی(unpack) کنيد./n\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -478,23 +488,22 @@ msgstr ""
 "اقدام به پياده-سازی (unpack) فايل ها نکنيد./n\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "/nبا تشکر از درخواست شما، آنچه سفارش داده ايد به طور کامل فهميده شد، و در "
 "حال تدارک است. بسته درخواستی می بايست تا ده دقيقه آينده به دست شما برسد./n\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "/nاگر بسته ارسال نشده، ممکن است به علت حجم بالای بسته و عدم توانايی سرويس "
@@ -504,7 +513,7 @@ msgstr ""
 "است./n\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -515,7 +524,7 @@ msgstr ""
 "شما را نداريم اما در حال رفع اين مشکل هستيم، خواهش می کنيم صبور باشيد./n\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -524,6 +533,205 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"لطفن به این ایمیل (gettor at torproject.rog)پاسخی ارسال کنید و نام یک بسته ی\n"
+" اطلاعاتی واحد را در هر کجا از بدنه ی ایمیل وارد کنید\n"
+".\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "تنها کاری که لازم است انجام دهید این است که کلمه کلیدی \"split\" را در "
+#~ "جایی در\n"
+#~ " بدنه ایمیل خود، به این صورت، قرار دهید\n"
+#~ ":\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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 را از وضعیت "
+#~ "rar\n"
+#~ " خارج می کند. اگر این برنامه را روی کامپیوتر خود نصب نکرده اید، از اینجا "
+#~ "می\n"
+#~ " توانید دریافت کنید:\n"
+#~ " \n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "برای پیاده-سازی بسته ی Tor خود، کافی است روی پرونده ی \".exe\" دوبار "
+#~ "کلیک\n"
+#~ " کنید\n"
+#~ ".\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/fi/gettor.po b/i18n/fi/gettor.po
index bebcad1..7e0e68f 100644
--- a/i18n/fi/gettor.po
+++ b/i18n/fi/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"    Moi, Tämä on \"GetTor\" automaattivastaaja.\n"
+"\n"
+"    Kiitos yhteydenotostasi.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "    Moi, Tämä on \"GetTor\" automaattivastaaja.\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -44,7 +52,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -58,7 +66,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -74,20 +82,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"Please note that currently, we can't process HTML emails or base 64\n"
-"mails. You will need to send plain text."
-msgstr ""
-"\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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -100,11 +95,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "\tLähetän sinulle Tor paketin kunhan kerrot minkä haluat. Ole\n"
@@ -112,11 +114,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "\tVastaa (reply) tähän sähköpostiin (to gettor at torproject.org)\n"
@@ -125,19 +127,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "\tPAIKALLINEN TOR VERSIO\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "\tSaadaksesi haluamasi kieliversion TOR ohjelmasta, kerro\n"
@@ -145,11 +151,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -158,7 +164,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -167,7 +173,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -176,7 +182,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -206,7 +212,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -215,21 +221,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "    OSIIN JAETUT PAKETIT (SPLITATUT)\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "\tJos sinulla on hidas yhteys tai et voi vastaanottaa suuria\n"
@@ -239,15 +246,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"\tSisällytä sana 'split' sähköpostiviestisi johonkin kohtaan:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -259,7 +267,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -271,7 +279,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -281,11 +289,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "\t2.) Pura (unzip) kaikki osatiedostot joiden nimi päättyy\n"
@@ -293,7 +302,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -305,30 +314,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\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/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"\tPurkaaksesi Tor paketin, tuplaklikkaa \".exe\" tiedostoa.\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -343,7 +336,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -352,14 +345,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -368,11 +363,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "\tVihje: Jos PC:ssäsi on GnuPG asennettuna, käytä gpg\n"
@@ -381,20 +381,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "    Tulos näyttää jotakuinkin tällaiselta:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "    Jos komentorivi (dos) työskentely ei ole sinulle tuttua, kokeile \n"
@@ -402,7 +407,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -421,11 +432,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "    Voit pyytää siltaa lähettämällä emailia joka sisältää \"get bridges\"\n"
@@ -434,7 +447,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -447,7 +460,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -465,7 +478,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -478,12 +491,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Kiitos pyynnöstäsi. Se ymmärrettiin ja on nyt \n"
@@ -491,11 +503,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "    Jos et saa pakettia, se on ehkä liian suuri sähköpostiohjelmallesi.\n"
@@ -505,7 +517,7 @@ msgstr ""
 "browser-bundle.\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -517,7 +529,7 @@ msgstr ""
 "kiitos....\n"
 "  "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -526,6 +538,201 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\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/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "Please note that currently, we can't process HTML emails or base 64\n"
+#~ "mails. You will need to send plain text."
+#~ msgstr ""
+#~ "\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"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "\tSisällytä sana 'split' sähköpostiviestisi johonkin kohtaan:\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "\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"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "\tPurkaaksesi Tor paketin, tuplaklikkaa \".exe\" tiedostoa.\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/fil/gettor.po b/i18n/fil/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/fil/gettor.po
+++ b/i18n/fil/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/fo/gettor.po b/i18n/fo/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/fo/gettor.po
+++ b/i18n/fo/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/fr/gettor.po b/i18n/fr/gettor.po
index 75653fe..ec56b8b 100644
--- a/i18n/fr/gettor.po
+++ b/i18n/fr/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"    Bonjour, je suis le robot \"GetTor\".\n"
+"\n"
+"    Merci de votre requête.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "    Bonjour, je suis le robot \"GetTor\".\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -45,7 +53,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -60,7 +68,7 @@ msgstr ""
 "envoyé.\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -77,20 +85,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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 "
-"format HTML ou en base 64\n"
-"    Vous allez devoir envoyer un courriel au format texte.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -104,11 +99,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "     Je vais vous envoyer un paquet Tor, si vous me dites lequel vous "
@@ -117,11 +119,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "    Veuillez répondre à ce courriel (à gettor at torproject.org), et me dire\n"
@@ -130,19 +132,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "    OBTENIR DES VERSIONS DE TOR DANS VOTRE LANGUE\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "    Afin d'obtenir une version de Tor dans votre langue, veuillez spécifer "
@@ -152,11 +158,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -166,7 +172,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -174,7 +180,7 @@ msgstr ""
 "    Liste de langues supportées :\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -183,7 +189,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -213,7 +219,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -223,21 +229,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "    PAQUETS DE PETITE TAILLE\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "    Si votre bande passante est limitée ou si votre fournisseur de courriel "
@@ -250,16 +257,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"    Il suffit d'inclure le mot clef 'split' quelque part dans votre "
-"courriel, comme ceci :\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -272,7 +279,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -284,7 +291,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -294,11 +301,12 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "    2.) Dézippez tous les fichiers finissant en \".z\". Si vous avze "
@@ -308,7 +316,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -320,33 +328,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"    5.) Maintenant utilisez un logiciel qui sait décompresser des fichiers "
-"RAR multiples.\n"
-"         Sous Windows, c'est généralement WinRAR. Si vous n'avez pas "
-"installé\n"
-"        ce logciel sur votre ordinateur encore, vous pouvez l'obtenir ici :\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:490
-#, 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 "
-"fichier \".exe\".\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -362,7 +351,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -372,14 +361,16 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -388,11 +379,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "    Conseil : Si vous avez installé GnuPG sur votre ordinateur, utilisez\n"
@@ -401,20 +397,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "    Le résultat devrait ressembler à peu près à cela :\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "    Si vous n'êtes pas familier avec les outils en ligne de commande,\n"
@@ -422,7 +423,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -444,11 +451,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "    Vous pouvez connaître un serveur passerelle en envoyant un courriel qui "
@@ -458,7 +467,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -471,7 +480,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -491,7 +500,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -503,12 +512,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Merci de votre demande. Elle a été comprise. Votre demande est en cours\n"
@@ -516,11 +524,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "    S'il n'arrive pas, il se pourrait que le paquet est trop lours pour "
@@ -532,7 +540,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -545,7 +553,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -554,6 +562,206 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"    Veuillez répondre à ce courriel (à gettor at torproject.org), et me dire\n"
+"    un seul nom de paquet, n'importe-où dans le corps texte de votre "
+"courriel.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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 format HTML ou en base 64\n"
+#~ "    Vous allez devoir envoyer un courriel au format texte.\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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 RAR multiples.\n"
+#~ "         Sous Windows, c'est généralement WinRAR. Si vous n'avez pas "
+#~ "installé\n"
+#~ "        ce logciel sur votre ordinateur encore, vous pouvez l'obtenir "
+#~ "ici :\n"
+#~ "\n"
+#~ "    "
+
+#, 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 fichier \".exe\".\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/fur/gettor.po b/i18n/fur/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/fur/gettor.po
+++ b/i18n/fur/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/fy/gettor.po b/i18n/fy/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/fy/gettor.po
+++ b/i18n/fy/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ga/gettor.po b/i18n/ga/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ga/gettor.po
+++ b/i18n/ga/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/gl/gettor.po b/i18n/gl/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/gl/gettor.po
+++ b/i18n/gl/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/gu/gettor.po b/i18n/gu/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/gu/gettor.po
+++ b/i18n/gu/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/gun/gettor.po b/i18n/gun/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/gun/gettor.po
+++ b/i18n/gun/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ha/gettor.po b/i18n/ha/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ha/gettor.po
+++ b/i18n/ha/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/he/gettor.po b/i18n/he/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/he/gettor.po
+++ b/i18n/he/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/hi/gettor.po b/i18n/hi/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/hi/gettor.po
+++ b/i18n/hi/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/hr/gettor.po b/i18n/hr/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/hr/gettor.po
+++ b/i18n/hr/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ht/gettor.po b/i18n/ht/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ht/gettor.po
+++ b/i18n/ht/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/hu/gettor.po b/i18n/hu/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/hu/gettor.po
+++ b/i18n/hu/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/hy/gettor.po b/i18n/hy/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/hy/gettor.po
+++ b/i18n/hy/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/id/gettor.po b/i18n/id/gettor.po
index 80c2e2e..0b614b2 100644
--- a/i18n/id/gettor.po
+++ b/i18n/id/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"Hallo, Ini adalah \"getTor\" robot.\n"
+"\n"
+"Terima kasih atas permohonan Anda.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Hallo, Ini adalah \"getTor\" robot.\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -44,7 +52,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -59,7 +67,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -75,20 +83,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"mengirimkan email dalam format palin text.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -100,11 +95,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "Kami mengirimkan paket Tor melalui email, jika Anda memberitahu kami paket\n"
@@ -113,11 +115,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Mohon balas ke mail ini (to gettor at torproject.org), dan beritahu kami "
@@ -126,19 +128,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "MENDAPATKAN VERSI LOKAL DARI TOR\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "Untuk mendapatkan versi Tor yang telah diterjemahkan kedalam bahasa Anda,\n"
@@ -146,11 +152,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -159,7 +165,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -167,7 +173,7 @@ msgstr ""
 "daftar lokal yang didukung:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -176,7 +182,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -206,7 +212,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -215,21 +221,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "PAKET-PAKET DENGAN UKURAN KECIL\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "Jika bandwidth Anda kecil atau provider Anda tidak memperbolehkan Anda "
@@ -239,15 +246,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"Gunakan kata kunci 'split' dimanapun dalam email Anda:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -259,7 +267,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -272,7 +280,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -281,11 +289,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2.) Unzip semua file dengan ektensi (akhiran) \".z\"Jika Anda menyimpan "
@@ -295,7 +304,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -306,30 +315,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"5.) Sekarang gunakan program yang dapat melakukan unrar multivolume RAR\n"
-"archieve. Pada Windows, program ini biasanya adalah WinRAR. Jika Anda tidak\n"
-"mempunyainya, Anda dapat mendapatkannya di:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, 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/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -344,7 +337,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -354,14 +347,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -370,11 +365,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "Petunjuk: Jika komputer Anda telah diinstall GnuPG, gunakan gpg command "
@@ -383,20 +383,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "Outputnya akan tampat seperti ini:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "Jika Anda tidak biasa menggunakan command line, Anda dapat menggunakan\n"
@@ -404,7 +409,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -426,11 +437,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "Anda dapat memperoleh bridge dengan mengirimkan email yang mengandung \"get\n"
@@ -438,7 +451,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -450,7 +463,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -467,7 +480,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -479,12 +492,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Terima kasih atas permohonan Anda. Permohonan Anda telah dipahami.\n"
@@ -493,11 +505,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "Jika tidak juga tiba, paket mungkin terlalu besar bagi email Anda.\n"
@@ -507,7 +519,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -520,7 +532,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -529,6 +541,202 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\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/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "mengirimkan email dalam format palin text.\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "Gunakan kata kunci 'split' dimanapun dalam email Anda:\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "archieve. Pada Windows, program ini biasanya adalah WinRAR. Jika Anda "
+#~ "tidak\n"
+#~ "mempunyainya, Anda dapat mendapatkannya di:\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/is/gettor.po b/i18n/is/gettor.po
index 15a1c54..810ff7c 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"Halló, þetta er \"Náðu í Tor\" vélmennið.\n"
+"\n"
+"Takk fyrir beiðnina.\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Halló, þetta er \"Náðu í Tor\" vélmennið.\n"
@@ -30,11 +37,11 @@ msgstr ""
 "Takk fyrir beiðnina.\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -42,7 +49,7 @@ msgstr ""
 "reikning hjá gmail.com eða yahoo.cn og senda póst frá öðrum hvorum þeirra\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -56,7 +63,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -70,20 +77,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"base 64 póstum. Þú verður að senda póst með einfaldri textagerð.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -96,11 +90,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "Ég mun senda þér Tor-pakkann ef þú segir mér hvern þú vilt fá. Vinsamlegast\n"
@@ -108,11 +109,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Vinsamlegast svaraðu á þetta netfang (gettor at torproject.org), og segðu mér\n"
@@ -120,18 +121,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "SÆKI STAÐFÆRÐAR ÚTGÁFUR AF TOR\n"
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "Til þess að fá útgáfu af Tor þýdda yfir á þitt tungumál, gerðu grein fyrir\n"
@@ -140,25 +145,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). 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/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
 "\n"
 " Listi yfir studdar staðfærslur:\n"
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -167,7 +172,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -197,7 +202,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -206,22 +211,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "\tMINNI STÆRÐ AF PÖKKUM\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "\tEf bandvíddin þín er lág eða þú hefur ekkivöl á að fá stór viðhengi með\n"
@@ -230,18 +236,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"\tEinfaldlega settu inn lykilorðið 'split' einhvers staðar í tölvupóstinn "
-"þinn\n"
-"\tlíkt og:\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -253,7 +257,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -266,7 +270,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -275,11 +279,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2.) Afþjappaðu allar skrár sem enda á \".z\". Ef þú vistaðir öll viðhengi í "
@@ -287,7 +292,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -298,64 +303,69 @@ msgstr ""
 "hverjum pakka. (gpg --verify)\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-" 5.) Notaðu núna forrit sem getur afþjappað RAR- skrár.Á\n"
-" Windows er vanalegast notast við Win-RAR. Ef það er ekki uppsett á tölvunni "
-"þinni geturu náð í það hér: \n"
-"\n"
-
-#: lib/gettor/i18n.py:490
-#, 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/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -365,19 +375,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -386,32 +398,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -420,6 +432,201 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"Vinsamlegast svaraðu á þetta netfang (gettor at torproject.org), og segðu mér\n"
+"heiti á einum pakkanna einhvers staðar í meginmáli veffpóstsins.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "base 64 póstum. Þú verður að senda póst með einfaldri textagerð.\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "\tEinfaldlega settu inn lykilorðið 'split' einhvers staðar í tölvupóstinn "
+#~ "þinn\n"
+#~ "\tlíkt og:\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ " Windows er vanalegast notast við Win-RAR. Ef það er ekki uppsett á "
+#~ "tölvunni þinni geturu náð í það hér: \n"
+#~ "\n"
+
+#, 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"
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/it/gettor.po b/i18n/it/gettor.po
index 230ac16..da93f76 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"Ciao, sono il robot \"GetTor\".\n"
 "\n"
-"Thank you for your request."
+"Ti ringrazio per la richiesta.\n"
+"\n"
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Ciao, sono il robot \"GetTor\".\n"
@@ -30,11 +37,11 @@ msgstr ""
 "Ti ringrazio per la richiesta.\n"
 "\n"
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -44,7 +51,7 @@ msgstr ""
 "uno di questi.\n"
 "\n"
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -57,7 +64,7 @@ msgstr ""
 "campo \"From\" è realmente quello che spedisce la mail.\n"
 "\n"
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -73,19 +80,7 @@ msgstr ""
 "successivi).\n"
 "\n"
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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 "
-"64.\n"
-"E' necessario spedire in testo semplice.\n"
-"\n"
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -96,51 +91,62 @@ msgstr ""
 "persona a questo indirizzo: tor-assistants at torproject.org\n"
 "\n"
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 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/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"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/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "OTTENENDO LE VERSIONI LOCALIZZATE DI TOR\n"
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 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/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -148,14 +154,14 @@ msgstr ""
 "localizzata\n"
 "per il Cinese. Controlla sotto per una lista dei codici lingua supportati.\n"
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
 "\n"
 "Lista delle localizzazioni supportate:\n"
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -163,7 +169,7 @@ msgstr ""
 "Qui trovi una lista di tutti i linguaggi disponibili:\n"
 "\n"
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -192,7 +198,7 @@ msgstr ""
 "gettor+zh at torproject.org: Cinese\n"
 "\n"
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -200,20 +206,21 @@ msgstr ""
 "Se non selezioni alcun linguaggio, riceverai la versione Inglese.\n"
 "\n"
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "PACCHETTI CON DIMENSIONE RIDOTTA\n"
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "Se la tua banda è bassa o il tuo provider non ti permette di \n"
@@ -222,15 +229,16 @@ msgstr ""
 "invece di uno grande.\n"
 "\n"
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"Includi semplicemente la parola chiave 'split' in qualche parte della tua "
-"email:\n"
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -241,77 +249,92 @@ msgstr ""
 "del Tor Browser Bundle in una serie di allegati da 1,4MB.\n"
 "\n"
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -321,19 +344,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -342,32 +367,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -375,3 +400,174 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+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/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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 64.\n"
+#~ "E' necessario spedire in testo semplice.\n"
+#~ "\n"
+
+#, 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"
diff --git a/i18n/ja/gettor.po b/i18n/ja/gettor.po
index e79873f..6c44721 100644
--- a/i18n/ja/gettor.po
+++ b/i18n/ja/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"    こんにちわ。こちらは\"GetTor\"自動返信ロボットです。\n"
 "\n"
-"Thank you for your request."
+"    リクエストありがとうございます。\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "    こんにちわ。こちらは\"GetTor\"自動返信ロボットです。\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -45,7 +53,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -59,20 +67,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -85,11 +87,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "    どれが必要か指示していただければ、のちほどTorパッケージをメールでお送りし"
@@ -98,11 +107,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "    このメールの送信元 (gettor at torproject.org)に返信して、\n"
@@ -110,19 +119,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "    【Torのローカライズ版を入手する】\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "    あなたの使う言語に翻訳されたTorを使うには、以下のように\n"
@@ -130,14 +143,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -145,7 +158,7 @@ msgstr ""
 "    サポートするロカールリスト:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -154,7 +167,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -169,7 +182,7 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -178,103 +191,124 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "    【軽量版のパッケージ】\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -284,19 +318,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -314,26 +350,26 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -346,7 +382,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -355,6 +391,160 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"    このメールの送信元 (gettor at torproject.org)に返信して、\n"
+"    メールの本文の中にパッケージ名を一つ書いてください。\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
 #~ msgid ""
 #~ "\n"
 #~ "    SUPPORT\n"
diff --git a/i18n/jv/gettor.po b/i18n/jv/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/jv/gettor.po
+++ b/i18n/jv/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ka/gettor.po b/i18n/ka/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/ka/gettor.po
+++ b/i18n/ka/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/km/gettor.po b/i18n/km/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/km/gettor.po
+++ b/i18n/km/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/kn/gettor.po b/i18n/kn/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/kn/gettor.po
+++ b/i18n/kn/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ko/gettor.po b/i18n/ko/gettor.po
index 7273509..c1588e4 100644
--- a/i18n/ko/gettor.po
+++ b/i18n/ko/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"안녕하세요, 저는 \"GetTor\" 로봇입니다.\n"
+"\n"
+"당신의 요청에 대해 감사드립니다.\n"
 "\n"
-"Thank you for your request."
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "안녕하세요, 저는 \"GetTor\" 로봇입니다.\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -44,7 +52,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -59,7 +67,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -74,56 +82,61 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -138,103 +151,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -244,19 +278,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -265,32 +301,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -298,3 +334,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ku/gettor.po b/i18n/ku/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/ku/gettor.po
+++ b/i18n/ku/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/kw/gettor.po b/i18n/kw/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/kw/gettor.po
+++ b/i18n/kw/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ky/gettor.po b/i18n/ky/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ky/gettor.po
+++ b/i18n/ky/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/lb/gettor.po b/i18n/lb/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/lb/gettor.po
+++ b/i18n/lb/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/lg/gettor.po b/i18n/lg/gettor.po
deleted file mode 100644
index 5c4039d..0000000
--- a/i18n/lg/gettor.po
+++ /dev/null
@@ -1,271 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+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/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
-msgstr ""
-
-#: lib/gettor/i18n.py:412
-msgid ""
-" Unfortunately, we won't answer you 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/i18n.py:416
-msgid ""
-"We only process requests from email services that support \"DKIM\",\n"
-"which 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/i18n.py:420
-msgid ""
-"(We apologize if you didn't ask for this mail. Since your email is from\n"
-"a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
-msgid ""
-"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/i18n.py:430
-msgid ""
-"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/i18n.py:433
-msgid ""
-"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/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
-msgstr ""
-
-#: lib/gettor/i18n.py:438
-msgid ""
-"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/i18n.py:441
-msgid ""
-"This 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/i18n.py:445
-msgid " List of supported locales:"
-msgstr ""
-
-#: lib/gettor/i18n.py:447
-msgid "Here is a list of all available languages:"
-msgstr ""
-
-#: lib/gettor/i18n.py:449
-msgid ""
-"    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"
-msgstr ""
-
-#: lib/gettor/i18n.py:461
-msgid "If you select no language, you will receive the English version."
-msgstr ""
-
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
-msgstr ""
-
-#: lib/gettor/i18n.py:465
-msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is 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/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
-msgstr ""
-
-#: lib/gettor/i18n.py:472
-msgid ""
-"Sending this 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/i18n.py:475
-msgid ""
-"After having received all parts, you need to re-assemble them to \n"
-"one package again. This is done as follows:"
-msgstr ""
-
-#: lib/gettor/i18n.py:478
-msgid "1.) Save all received attachments into one folder on your disk."
-msgstr ""
-
-#: lib/gettor/i18n.py:480
-msgid ""
-"2.) 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/i18n.py:483
-msgid ""
-"3.) Verify all files as described in the mail you received with \n"
-"each package. (gpg --verify)"
-msgstr ""
-
-#: lib/gettor/i18n.py:486
-msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-
-#: lib/gettor/i18n.py:492
-msgid ""
-"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/i18n.py:496
-msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
-msgstr ""
-
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
-msgstr ""
-
-#: lib/gettor/i18n.py:503
-msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
-"package and verify the signature."
-msgstr ""
-
-#: lib/gettor/i18n.py:506
-msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
-msgstr ""
-
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
-msgstr ""
-
-#: lib/gettor/i18n.py:511
-msgid ""
-"If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
-msgstr ""
-
-#: lib/gettor/i18n.py:514
-msgid ""
-"If your Internet connection blocks access to the Tor network, you\n"
-"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
-"are Tor relays that aren't listed in the main directory. Since there\n"
-"is no complete public list of them, even if 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/i18n.py:521
-msgid ""
-"You 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/i18n.py:524
-msgid ""
-"It is also possible to fetch bridges with a web browser at the following\n"
-"url: https://bridges.torproject.org/"
-msgstr ""
-
-#: lib/gettor/i18n.py:527
-msgid ""
-"IMPORTANT NOTE:\n"
-"Since this is part of a split-file request, you need to wait for\n"
-"all split files to be 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/i18n.py:533
-msgid ""
-"Packages might arrive out of order! Please make sure you received\n"
-"all packages before you attempt to unpack them!"
-msgstr ""
-
-#: lib/gettor/i18n.py:536
-msgid ""
-"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/i18n.py:540
-msgid ""
-"If it 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/i18n.py:543
-msgid ""
-"Unfortunately we 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/i18n.py:546
-msgid ""
-"Unfortunately there is no split package available for the package you\n"
-"requested. Please send us another package name or request the same package \n"
-"again, but remove the 'split' keyword. In that case we'll send you the "
-"whole \n"
-"package. Make sure this is what you want."
-msgstr ""
diff --git a/i18n/ln/gettor.po b/i18n/ln/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ln/gettor.po
+++ b/i18n/ln/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/lo/gettor.po b/i18n/lo/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/lo/gettor.po
+++ b/i18n/lo/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/lt/gettor.po b/i18n/lt/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/lt/gettor.po
+++ b/i18n/lt/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/lv/gettor.po b/i18n/lv/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/lv/gettor.po
+++ b/i18n/lv/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/mg/gettor.po b/i18n/mg/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/mg/gettor.po
+++ b/i18n/mg/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/mi/gettor.po b/i18n/mi/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/mi/gettor.po
+++ b/i18n/mi/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/mk/gettor.po b/i18n/mk/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/mk/gettor.po
+++ b/i18n/mk/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ml/gettor.po b/i18n/ml/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ml/gettor.po
+++ b/i18n/ml/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/mn/gettor.po b/i18n/mn/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/mn/gettor.po
+++ b/i18n/mn/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/mr/gettor.po b/i18n/mr/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/mr/gettor.po
+++ b/i18n/mr/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ms/gettor.po b/i18n/ms/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ms/gettor.po
+++ b/i18n/ms/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/mt/gettor.po b/i18n/mt/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/mt/gettor.po
+++ b/i18n/mt/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/nah/gettor.po b/i18n/nah/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/nah/gettor.po
+++ b/i18n/nah/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/nap/gettor.po b/i18n/nap/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/nap/gettor.po
+++ b/i18n/nap/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/nb/gettor.po b/i18n/nb/gettor.po
index e916f6c..977fdf0 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,84 +17,90 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -270,6 +299,154 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
 #~ msgid ""
 #~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
diff --git a/i18n/ne/gettor.po b/i18n/ne/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ne/gettor.po
+++ b/i18n/ne/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/nl/gettor.po b/i18n/nl/gettor.po
index dd5f458..dfd1ce5 100644
--- a/i18n/nl/gettor.po
+++ b/i18n/nl/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+" Hallo, dit is de \"GetTor\" robot.\n"
+"\n"
+"Dank u voor uw verzoek.\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 " Hallo, dit is de \"GetTor\" robot.\n"
@@ -29,11 +36,11 @@ msgstr ""
 "Dank u voor uw verzoek.\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -43,7 +50,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -58,7 +65,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -73,20 +80,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"U zult gewone text (plain text) e-mails moeten versturen.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -98,11 +92,18 @@ msgstr ""
 "Neem in achting dat de voertaal Engels is. \n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "Ik zal u een Tor paket sturen als u vertelt welke u wilt. \n"
@@ -110,11 +111,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Antwoord op dit e-mailadres (gettor at torproject.org), en noem in de body van "
@@ -122,20 +123,24 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "Bezig met het verkrijgen van gelokaliseerde versies van Tor.\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "Om een taalspecifieke versie van Tor te verkrijgen, \n"
@@ -143,11 +148,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -157,7 +162,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -165,7 +170,7 @@ msgstr ""
 "Lijst van ondersteunde gelokaliseerde versies: \n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -174,7 +179,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -204,7 +209,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -213,21 +218,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "PAKKETTEN MET KLEINERE GROOTTE\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "Indien u weinig bandbreedte heeft of een provider heeft die\n"
@@ -236,15 +242,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"Neem in uw e-mail het woord 'split' op, zoals hier voorgedaan:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -256,7 +263,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -269,7 +276,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -278,11 +285,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2. Unzip alle bestanden die eindigen op \".z\". Als u een nieuwe map heeft "
@@ -291,7 +299,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -303,31 +311,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"5.) Gebruik nu een programma die meerdere archieven kan unrarren.\n"
-"Op Windows is dit meestal WinRAR. Als u dit niet heeft\n"
-"kunt u het downloaden op: \n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:490
-#, 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\" "
-"bestand.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -341,7 +332,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -351,14 +342,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -367,11 +360,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "Hint: Als u computer GnuPG heeft, gebruik dan de commandline tool als volgt "
@@ -379,20 +377,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "De output zou ietwat op dit moeten lijken:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "Als u niet betekent bent met commandline tools, probeer dan te zoeken naar "
@@ -400,7 +403,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -420,11 +429,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "U kunt een bridge verkrijgen door een e-mail te sturen naar: "
@@ -432,7 +443,7 @@ msgstr ""
 "Vermeld hierbij \"get bridges\"\n"
 " in de body van uw bericht.    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -444,7 +455,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -462,7 +473,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -474,12 +485,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Dank u voor uw verzoek. Uw verzoek is begrepen en wordt momenteel verwerkt. "
@@ -487,11 +497,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "Als het pakket niet ontvangen wordt, is het pakket mogelijk te groot voor uw "
@@ -502,7 +512,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -515,7 +525,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -524,6 +534,201 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"Antwoord op dit e-mailadres (gettor at torproject.org), en noem in de body van "
+"uw bericht een enkel pakket.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "U zult gewone text (plain text) e-mails moeten versturen.\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "Op Windows is dit meestal WinRAR. Als u dit niet heeft\n"
+#~ "kunt u het downloaden op: \n"
+#~ "\n"
+#~ "    "
+
+#, 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\" "
+#~ "bestand.\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/nn/gettor.po b/i18n/nn/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/nn/gettor.po
+++ b/i18n/nn/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/nso/gettor.po b/i18n/nso/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/nso/gettor.po
+++ b/i18n/nso/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/oc/gettor.po b/i18n/oc/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/oc/gettor.po
+++ b/i18n/oc/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/or/gettor.po b/i18n/or/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/or/gettor.po
+++ b/i18n/or/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/pa/gettor.po b/i18n/pa/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/pa/gettor.po
+++ b/i18n/pa/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/pap/gettor.po b/i18n/pap/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/pap/gettor.po
+++ b/i18n/pap/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/pl/gettor.po b/i18n/pl/gettor.po
index ed6cbe5..93de9fb 100644
--- a/i18n/pl/gettor.po
+++ b/i18n/pl/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GetTor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\n"
 "PO-Revision-Date: 2010-04-27 11:30-0700\n"
 "Last-Translator: Bogdan Drozdowski <bogdan / op . pl>\n"
 "Language-Team: pl\n"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"    Witaj, Tu robot \"GetTor\".\n"
+"\n"
+"    Dziękuję za Twoje zapytanie.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "    Witaj, Tu robot \"GetTor\".\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -44,7 +52,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -58,7 +66,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -72,19 +80,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"    Musisz wysłać list zwykłym tekstem.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -96,11 +92,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "    Wyślę Ci paczkę z Torem, jeśli powiesz, którą chcesz.\n"
@@ -108,11 +111,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "    ProszÄ™ odpisz na ten list (na gettor at torproject.org), i podaj mi\n"
@@ -120,19 +123,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "    OTRZYMYWANIE PRZETŁUMACZONYCH WERSJI TORA\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "    Aby otrzymać wersję Tora przetłumaczoną na Twój język, podaj żądany\n"
@@ -140,11 +147,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -154,7 +161,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -162,7 +169,7 @@ msgstr ""
 "    Lista obsługiwanych tłumaczeń:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -171,7 +178,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -201,7 +208,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -210,21 +217,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "    PACZKI O MNIEJSZYCH ROZMIARACH\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "    Jeśli przepustowość Twojego łącza jest niska lub Twój dostawca \n"
@@ -234,15 +242,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"    Po prostu dołącz słowo 'split' gdzieś w swoim liście, o tak:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -254,7 +263,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -266,7 +275,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -275,11 +284,12 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "    2.) Rozpakuj wszystkie pliki zakonczone na \".z\". Jeśli zapisałeś/aś\n"
@@ -288,7 +298,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -300,31 +310,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"    5.) Teraz użyj programu, który może rozpakować wieloczęściowe archiwa\n"
-"        RAR. Na Windows, zwykle to WinRAR. If you don't have that\n"
-"        installed on you computer yet, get it here:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"        Aby rozpakować paczkę Tora, po prostu kliknij dwukrotnie plik \n"
-"        \".exe\".\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -338,7 +331,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -347,14 +340,16 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -363,11 +358,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "    Wskazówka: Jeśli na Twoim komputerze jest zainstalowany GnuPG, użyj\n"
@@ -376,20 +376,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "    Wynik powinien wyglądać podobnie do tego:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "    Jeśli nie znasz narzędzi linii poleceń, spróbuj znaleźć\n"
@@ -397,7 +402,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -418,11 +429,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "    Mostek możesz otrzymać, wysyłając e-mail zawierający \"get bridges\"\n"
@@ -431,7 +444,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -443,7 +456,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -460,7 +473,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -472,12 +485,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Dziękujemy za Twoje żądanie. Zostało ono zrozumiane pomyślnie. Twoje "
@@ -488,11 +500,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "    Jeśli nie przyjdzie, może być zbyt duża dla Twojego dostawcy poczty.\n"
@@ -503,7 +515,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -516,7 +528,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -525,6 +537,201 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"    ProszÄ™ odpisz na ten list (na gettor at torproject.org), i podaj mi\n"
+"    jedną nazwę paczki gdziekolwiek w treści Twojego listu.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    Musisz wysłać list zwykłym tekstem.\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "        RAR. Na Windows, zwykle to WinRAR. If you don't have that\n"
+#~ "        installed on you computer yet, get it here:\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "        Aby rozpakować paczkę Tora, po prostu kliknij dwukrotnie plik \n"
+#~ "        \".exe\".\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/pms/gettor.po b/i18n/pms/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/pms/gettor.po
+++ b/i18n/pms/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ps/gettor.po b/i18n/ps/gettor.po
index 862feae..4f51d92 100644
--- a/i18n/ps/gettor.po
+++ b/i18n/ps/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/pt/gettor.po b/i18n/pt/gettor.po
index 0eb3a88..f4d2dd7 100644
--- a/i18n/pt/gettor.po
+++ b/i18n/pt/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,84 +16,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -108,103 +114,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -214,19 +241,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -235,26 +264,26 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -270,7 +299,7 @@ msgstr ""
 "tentamos resolver esta situação.\n"
 "\n"
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -279,6 +308,154 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
 #~ msgid ""
 #~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
diff --git a/i18n/pt_BR/gettor.po b/i18n/pt_BR/gettor.po
index ca826b4..45e60dd 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"Olá, Este é o robô \"GetTor\".\n"
+"\n"
+"Obrigado por sua solicitação.\n"
 "\n"
-"Thank you for your request."
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Olá, Este é o robô \"GetTor\".\n"
@@ -31,11 +39,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -45,70 +53,75 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -123,103 +136,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -229,19 +263,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -250,32 +286,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -284,6 +320,154 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
 #~ msgid ""
 #~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
diff --git a/i18n/ro/gettor.po b/i18n/ro/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/ro/gettor.po
+++ b/i18n/ro/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ru/gettor.po b/i18n/ru/gettor.po
index 8938732..dc74fe0 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -18,12 +18,20 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+" Вас приветствует робот() \"GetTor\"().\n"
+"\n"
+" Большое спасибо() за ваш запрос.\n"
+"\n"
+" "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 " Вас приветствует робот() \"GetTor\"().\n"
@@ -32,11 +40,11 @@ msgstr ""
 "\n"
 " "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -47,7 +55,7 @@ msgstr ""
 "\n"
 " "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -62,7 +70,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -77,20 +85,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"    время мы не можем обрабатывать HTML и Base64 письма.\n"
-"    Вы должны выслать нам письмо в открытом тексте.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -103,11 +98,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "    Я вышлю вам установочный пакет Tor, если вы сообщите мне какой из них "
@@ -117,11 +119,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "    Пожалуйста, отправьте письмо на адрес gettor at torproject.org, указав\n"
@@ -129,19 +131,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "    ПОЛУЧЕНИЕ ЛОКАЛИЗОВАННЫХ ВЕРСИЙ TOR\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "    Чтобы получить версию Tor, переведенную а ваш язык, укажите\n"
@@ -149,11 +155,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -162,7 +168,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -170,7 +176,7 @@ msgstr ""
 "    Список поддерживаемых языков:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -179,7 +185,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -209,7 +215,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -218,21 +224,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "    ПАКЕТЫ МАЛОГО РАЗМЕРА\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "    Если ваше Интернет соединение работает медленно или провайдер \n"
@@ -242,15 +249,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"    Просто добавьте слово 'split' где-нибудь в письме, например так:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -263,7 +271,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -275,7 +283,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -284,11 +292,12 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "    2.) Разархивируйте все файлы, заканчивающиеся на \".z\". Если вы "
@@ -297,7 +306,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -310,32 +319,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"    5.) Теперь воспользуйтесь программой, которая может распаковывать "
-"разбитые архивы RAR. \n"
-"        Для Windows такой программой, как правило, является WinRAR. Если вы "
-"себе её еще \n"
-"        не установили, скачайте программу здесь:\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"        Распаковать пакет Tor можно двойным кликом на файле \".exe\".\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -350,7 +341,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -359,14 +350,16 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -376,11 +369,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "    Подсказка: Если на вашем компьютере установлена программа GnuPG, после\n"
@@ -389,20 +387,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "    Результат должен быть примерно таким:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "    Если вы не умеете работать с командной строкой, найдите \n"
@@ -410,7 +413,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -434,11 +443,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "    Вы можете получить мост, отправив сообщение, содержащее \"get bridges\"\n"
@@ -447,7 +458,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -460,7 +471,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -479,7 +490,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -492,12 +503,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "    Спасибо за ваш запрос. Мы его успешно приняли. В настоящее время\n"
@@ -507,11 +517,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "    Если вы его так и не получили, пакет, возможно, слишком велик для "
@@ -524,7 +534,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -537,7 +547,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -546,6 +556,202 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"    Пожалуйста, отправьте письмо на адрес gettor at torproject.org, указав\n"
+"    только название установочного пакета в теле вашего письма.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    время мы не можем обрабатывать HTML и Base64 письма.\n"
+#~ "    Вы должны выслать нам письмо в открытом тексте.\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "    Просто добавьте слово 'split' где-нибудь в письме, например так:\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "        Для Windows такой программой, как правило, является WinRAR. Если "
+#~ "вы себе её еще \n"
+#~ "        не установили, скачайте программу здесь:\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "        Распаковать пакет Tor можно двойным кликом на файле \".exe\".\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/sco/gettor.po b/i18n/sco/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/sco/gettor.po
+++ b/i18n/sco/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/sk/gettor.po b/i18n/sk/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/sk/gettor.po
+++ b/i18n/sk/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/sl/gettor.po b/i18n/sl/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/sl/gettor.po
+++ b/i18n/sl/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/so/gettor.po b/i18n/so/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/so/gettor.po
+++ b/i18n/so/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/son/gettor.po b/i18n/son/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/son/gettor.po
+++ b/i18n/son/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/sq/gettor.po b/i18n/sq/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/sq/gettor.po
+++ b/i18n/sq/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/sr/gettor.po b/i18n/sr/gettor.po
index ed0596d..ec20f12 100644
--- a/i18n/sr/gettor.po
+++ b/i18n/sr/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"Здраво, овде „GetTor“ робот.\n"
+"\n"
+"Хвала Вам на захтеву.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Здраво, овде „GetTor“ робот.\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -43,7 +51,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -57,7 +65,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -72,19 +80,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"поруке, због тога ћете морати да пошаљете прости текст.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -96,11 +92,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "Послаћу Вам Tor пакет ако ми кажете какав желите.\n"
@@ -108,11 +111,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Молимо Вас да одговорите на ову поруку преко адресе gettor at torproject.org, "
@@ -122,19 +125,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "ПРИКУПЉАЊЕ ЛОКАЛИЗОВАНИХ ИЗДАЊА TOR-А\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "Да бисте добили преведено издање Tor-а, унесите\n"
@@ -142,11 +149,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -156,7 +163,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -164,7 +171,7 @@ msgstr ""
 "Списак подржаних језика:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -173,7 +180,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -203,7 +210,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -212,21 +219,22 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "МАЊИ ПАКЕТИ\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "Ако Вам је пропусни опсег мали или провајдер не дозвољава \n"
@@ -236,15 +244,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"Укључите кључну реч „split“ негде у поруци као:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -256,7 +265,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -268,7 +277,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -277,11 +286,12 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2) Отпакујте све датотеке које се завршавају са „.z“. Ако сте сачували све\n"
@@ -290,7 +300,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -302,30 +312,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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"
-"Windows-у је то обично WinRAR. Ако још увек немате тај програм\n"
-"на рачунару, преузмите га овде:\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"Да бисте отпаковали Tor пакет, двапут кликните на извршну (.exe) датотеку.\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -339,7 +333,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -348,14 +342,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -364,11 +360,16 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "Савет: ако Ваш рачунар има инсталиран GnuPG, користите gpg\n"
@@ -376,20 +377,25 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "Завршна датотека би требало да изгледа овако некако:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "Ако се не разумете баш најбоље у алатке које раде преко командне линије,\n"
@@ -398,7 +404,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -419,11 +431,13 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "Можете доћи до бриџа слањем поруке која садржи „get bridges“\n"
@@ -432,7 +446,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -444,7 +458,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -462,7 +476,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -474,12 +488,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "Хвала Вам на захтеву. Тренутно га обрађујемо.\n"
@@ -487,11 +500,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "Ако Вам не стигне, пакет је вероватно превелики за Ваш провајдер.\n"
@@ -501,7 +514,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -513,7 +526,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -522,6 +535,202 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"Молимо Вас да одговорите на ову поруку преко адресе gettor at torproject.org, "
+"и\n"
+"реците нам\n"
+"назив једног пакета било где у поруци.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "поруке, због тога ћете морати да пошаљете прости текст.\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "Укључите кључну реч „split“ негде у поруци као:\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "Windows-у је то обично WinRAR. Ако још увек немате тај програм\n"
+#~ "на рачунару, преузмите га овде:\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "Да бисте отпаковали Tor пакет, двапут кликните на извршну (.exe) "
+#~ "датотеку.\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/st/gettor.po b/i18n/st/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/st/gettor.po
+++ b/i18n/st/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/su/gettor.po b/i18n/su/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/su/gettor.po
+++ b/i18n/su/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/sv/gettor.po b/i18n/sv/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/sv/gettor.po
+++ b/i18n/sv/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/sw/gettor.po b/i18n/sw/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/sw/gettor.po
+++ b/i18n/sw/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ta/gettor.po b/i18n/ta/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ta/gettor.po
+++ b/i18n/ta/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/te/gettor.po b/i18n/te/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/te/gettor.po
+++ b/i18n/te/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/templates/gettor.pot b/i18n/templates/gettor.pot
index 1cc52a5..36c17c6 100644
--- a/i18n/templates/gettor.pot
+++ b/i18n/templates/gettor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-21 21:50-0400\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,31 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
 "It was successfully understood. Your request is currently being processed.\n"
-"Your package should arrive within the next ten minutes."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:539
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:542
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:545
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -268,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/tg/gettor.po b/i18n/tg/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/tg/gettor.po
+++ b/i18n/tg/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/th/gettor.po b/i18n/th/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/th/gettor.po
+++ b/i18n/th/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/ti/gettor.po b/i18n/ti/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ti/gettor.po
+++ b/i18n/ti/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/tk/gettor.po b/i18n/tk/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/tk/gettor.po
+++ b/i18n/tk/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/tr/gettor.po b/i18n/tr/gettor.po
index 19c4742..afb2e4b 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,12 +17,20 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"Merhaba, bu bir \"GetTor\" robotu.\n"
 "\n"
-"Thank you for your request."
+"İstekte bulunduğunuz için teşekkür ederiz.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Merhaba, bu bir \"GetTor\" robotu.\n"
@@ -31,11 +39,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -45,7 +53,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -59,7 +67,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -74,19 +82,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"Lütfen düzmetin olarak tekrar gönderin\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -99,11 +95,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "I will mail you a Tor package, if you tell me which one you want.\n"
@@ -111,11 +114,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Please reply to this mail (to gettor at torproject.org), and tell me\n"
@@ -123,19 +126,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "OBTAINING LOCALIZED VERSIONS OF TOR\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "Tor'un dilinize çevrilmiş bir sürümünü edinmek için\n"
@@ -143,14 +150,14 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -158,7 +165,7 @@ msgstr ""
 "Desteklenen yerellerin listesi:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -167,7 +174,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -197,7 +204,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -206,39 +213,45 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "DAHA KÜÇÜK BOYUTLU PAKETLER\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -247,73 +260,82 @@ msgstr ""
 "    \n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"        Dosyayı açmak için, \".exe\" uzantılı dosyaya çift tıklamanız "
-"yeterli.\n"
-"\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -323,19 +345,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -344,32 +368,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -378,6 +402,180 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\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"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "Lütfen düzmetin olarak tekrar gönderin\n"
+#~ "\n"
+#~ "    "
+
+#, 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"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
diff --git a/i18n/uk/gettor.po b/i18n/uk/gettor.po
index 87884ca..e9cdf58 100644
--- a/i18n/uk/gettor.po
+++ b/i18n/uk/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,23 +16,29 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+"\n"
+"Привіт, Це Робот \"GetTor\". Дякую вам за ваш запит.\n"
 "\n"
-"Thank you for your request."
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "Привіт, Це Робот \"GetTor\". Дякую вам за ваш запит.\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -41,7 +47,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -56,7 +62,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -70,19 +76,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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. Вам потрібно буде відіслати простий текст.\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -94,11 +88,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "Я надішлю вам пакет програм Tor, якщо ви повідомите мені який пакет програм\n"
@@ -106,11 +107,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "Будь-ласка після вибору пакета надішліть лист на цю адресу\n"
@@ -120,32 +121,36 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -160,103 +165,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -266,19 +292,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -287,32 +315,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -321,6 +349,174 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"Будь-ласка після вибору пакета надішліть лист на цю адресу\n"
+"gettor at torproject.org, та напишіть мені назву пакету програм десь на "
+"початку\n"
+"вашого листа.\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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. Вам потрібно буде відіслати простий текст.\n"
+#~ "\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
diff --git a/i18n/ur/gettor.po b/i18n/ur/gettor.po
index 87d626a..0185886 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: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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,22 +17,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"آپ کی درخواست کا شکریہ\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "آپ کی درخواست کا شکریہ\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -40,7 +45,7 @@ msgstr ""
 "CN کے ساتھ ایک اکاؤنٹ اور ای میل بھیجو ان میں سے ایک\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -51,7 +56,7 @@ msgstr ""
 " ہم صرف ان درخواست  کو سپورٹ کرتے ھیں جو ای میل DKIM  پر عمل کر تے ہے\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -65,18 +70,7 @@ msgstr ""
 "سے اگے\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -87,51 +81,62 @@ msgstr ""
 "میل ایڈریس پر رابطہ کر سکتے ہیں tor-assistants at torproject.org\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "میں آپ کو ایک ٹار پیکج ای میل کرو گا, اگر آپ مجھے بتاو جو آپ چاہتے ہو. براہ "
 "مہربانی مندرجہ ذیل پیکج کے نام سے ایک کا انتخاب کریں. \n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "براہ مہربانی مجھے اس  ای میل پر جواب ریں (togettor at torproject.org). کہیں بھی "
 "آپ کے ای میل میں ایک پیکیج کا نام. \n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "TOR کا مقامی ورژن حاصل کرنا    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "TOR کا ایک ورژن جو آپ کی زبان میں ترجمہ ہوا ہووضاحت کروجو زبان آپ چاہتے ہیں "
 "اسے ای میل ایڈریس میں\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -139,14 +144,14 @@ msgstr ""
 "کوڈز میں فہرست ملاحظہ کریں\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
 "\n"
 "مقامی حمایت کردہ فہرست    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -154,7 +159,7 @@ msgstr ""
 "یہ تمام دستیاب زبانوں کی فہرست ہے\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -178,7 +183,7 @@ msgstr ""
 "+zh at torproject.org\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -186,20 +191,21 @@ msgstr ""
 "اگر آپ نے کوئی زبان منتخب نہ کی تو آپ انگریزی ورژن حاصل کریں گے\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "چھوٹے سائز کے پیکجز    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "اگر آپ کی بینڈ وڈتھ کم ہے, یا آپ کو سروس فراہم کرنے والے آپ کو اپنے ای میل "
@@ -208,14 +214,16 @@ msgstr ""
 "بجائے ایک بڑے سے کے\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"بس مطلوبہ الفاظ \"ٹکڑے ٹکڑے کر ڈالا\" شامل کریں, کہیں آپنے ای میل میں    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -226,7 +234,7 @@ msgstr ""
 "Bundleکوبھیجے سکتے ہیں\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -237,7 +245,7 @@ msgstr ""
 "درج ذيل ہے:\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -245,18 +253,19 @@ msgstr ""
 "1) سب ملحقات کو ایک فولڈر میں اپنے ڈسک پر محفوظ کریں    \n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2) Z سے ختم ہونے والی تمام فائلیں کھول دیں. آگر آپ تمام ملحقات ایک نئے فلڈر "
 "میں محفوظ کرتے ھیں, تو اس فولڈر میں تمام فائلیں کھولیں\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -267,28 +276,14 @@ msgstr ""
 "تصدیق)\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"اپنے پیکج کو کھولنے کے لیے صرف \"exe.\" پرڈبل کلک کریں\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -301,7 +296,7 @@ msgstr ""
 "میں سروع ہو جانا چاہے۔\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -310,14 +305,16 @@ msgstr ""
 "ہوسکتے ہیں۔    \n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 "\n"
@@ -325,36 +322,52 @@ msgstr ""
 "تصدیق کریں۔\n"
 "    "
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "شارہ: اگر اپ کے کمپیوٹرپر GnuPG نصب ہے، تو gpg کمانڈ لائن طریقہ کواستعمال "
 "کرتے ہوے زپ فائل کو کھل دو\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "اس کی پیداوار کسی حد تک اس طرح نظر آنی چا ہئے\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "اگر اپ کمانڈ لائن طریقہ سے ناواقف ہے تو تصویر ی صارف مواجہ کو تلاش کریں\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -372,18 +385,20 @@ msgstr ""
 "نہیں کر سکے گے۔\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "آپ اس ای میل ایڈریس : bridges at torporject.org پرایک ای میل بیجھ کرپل حاصل کر "
 "سکتے ہیں ، جس میں لکھا ہو\"پل حاصل کرو\"\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -394,7 +409,7 @@ msgstr ""
 "bridges.torproject.org \n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -409,7 +424,7 @@ msgstr ""
 "دیںاور فائل کو دومرتبہ کلک کر کے کھول دیں \n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -420,12 +435,11 @@ msgstr ""
 "کرلیں کہ آپ نے تمام پیکیج مصول کر لیے ہیں\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "آپ کی درخواست کے لئے آپ کا شکریہ.اسے کامیابی سے سمجھ لیا گیا ہےآپ کی درخواست "
@@ -433,11 +447,11 @@ msgstr ""
 "چاہئے\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "آگر یہ مصول نہیں ہوں گی، آپ کے ای میل فراہم کرنے والے کے لیے یہ بڑا ہوگا۔"
@@ -446,7 +460,7 @@ msgstr ""
 "چھوٹی ہے.\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -458,7 +472,7 @@ msgstr ""
 "ہیں\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -467,6 +481,194 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"براہ مہربانی مجھے اس  ای میل پر جواب ریں (togettor at torproject.org). کہیں بھی "
+"آپ کے ای میل میں ایک پیکیج کا نام. \n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "بس مطلوبہ الفاظ \"ٹکڑے ٹکڑے کر ڈالا\" شامل کریں, کہیں آپنے ای میل میں    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "اپنے پیکج کو کھولنے کے لیے صرف \"exe.\" پرڈبل کلک کریں\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/ve/gettor.po b/i18n/ve/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/ve/gettor.po
+++ b/i18n/ve/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/vi/gettor.po b/i18n/vi/gettor.po
index bc84703..125decb 100644
--- a/i18n/vi/gettor.po
+++ b/i18n/vi/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,84 +16,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -108,103 +114,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -214,19 +241,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -235,26 +264,26 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -272,7 +301,7 @@ msgstr ""
 "\n"
 "        "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -281,6 +310,154 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
 #~ msgid ""
 #~ "\n"
 #~ "    Hello! This is the \"GetTor\" robot.\n"
diff --git a/i18n/wa/gettor.po b/i18n/wa/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/wa/gettor.po
+++ b/i18n/wa/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/wo/gettor.po b/i18n/wo/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/wo/gettor.po
+++ b/i18n/wo/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/zh_CN/gettor.po b/i18n/zh_CN/gettor.po
index 61c9e3d..4c2e27b 100644
--- a/i18n/zh_CN/gettor.po
+++ b/i18n/zh_CN/gettor.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -16,12 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: lib/gettor/i18n.py:408
+#: lib/gettor/i18n.py:27
 #, fuzzy
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
 "\n"
-"Thank you for your request."
+"    您好,我是\"GetTor\"自动回复机器人。\n"
+"\n"
+"    感谢您的来信。\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:29
+#, fuzzy
+msgid "Thank you for your request."
 msgstr ""
 "\n"
 "    您好,我是\"GetTor\"自动回复机器人。\n"
@@ -30,11 +38,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 #, fuzzy
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 "\n"
@@ -43,7 +51,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 #, fuzzy
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
@@ -56,7 +64,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:420
+#: lib/gettor/i18n.py:39
 #, fuzzy
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
@@ -70,19 +78,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:424
-#, fuzzy
-msgid ""
-"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"
-"    请您发送纯文本格式的邮件。\n"
-"\n"
-"    "
-
-#: lib/gettor/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 #, fuzzy
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
@@ -94,11 +90,18 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:430
+#: lib/gettor/i18n.py:46
 #, fuzzy
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 "\n"
 "    若您告诉我需要哪份 Tor 软件包,我会发给您。\n"
@@ -106,11 +109,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 #, fuzzy
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 "\n"
 "    请回复此邮件(到 gettor at torproject.org),\n"
@@ -118,19 +121,23 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:436
+#: lib/gettor/i18n.py:59
 #, fuzzy
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 "\n"
 "    获取TOR的本地化版本\n"
 "    "
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 #, fuzzy
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 "\n"
 "    在收件人地址中指定您所需的语言代码,\n"
@@ -138,11 +145,11 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 #, fuzzy
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 "\n"
@@ -151,7 +158,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 #, fuzzy
 msgid " List of supported locales:"
 msgstr ""
@@ -159,7 +166,7 @@ msgstr ""
 "    支持语言环境列表:\n"
 "    "
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 #, fuzzy
 msgid "Here is a list of all available languages:"
 msgstr ""
@@ -168,7 +175,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 #, fuzzy
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
@@ -198,7 +205,7 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 #, fuzzy
 msgid "If you select no language, you will receive the English version."
 msgstr ""
@@ -207,36 +214,38 @@ msgstr ""
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:463
+#: lib/gettor/i18n.py:89
 #, fuzzy
-msgid "SMALLER SIZED PACKAGES"
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 "\n"
 "较小的文件包\n"
 "    "
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 #, fuzzy
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 "\n"
 "如果您的带宽低或者你的提供商不允许您接受电子邮件里的大的附件,GetTor有一个特"
 "点是您可以使它向您发送一组小的数据包而不是一个大的数据包。\n"
 "    "
 
-#: lib/gettor/i18n.py:470
-#, fuzzy
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
-"\n"
-"只需像这样在您的电子邮件中包含“split\"关键字:\n"
-"    "
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 #, fuzzy
 msgid ""
 "Sending this text in an email to GetTor will cause it to send you \n"
@@ -247,7 +256,7 @@ msgstr ""
 "Browser Bundle。\n"
 "    "
 
-#: lib/gettor/i18n.py:475
+#: lib/gettor/i18n.py:105
 #, fuzzy
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
@@ -257,7 +266,7 @@ msgstr ""
 "在接受全部的部分后,您需要把他们重新组装成一个文件包。步骤如下:\n"
 "    "
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 #, fuzzy
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
@@ -265,18 +274,19 @@ msgstr ""
 "1.)将所有接受到的附件保存在您的硬盘的同一个文件夹里。\n"
 "    "
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 #, fuzzy
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 "\n"
 "2.)将所有后缀名为“.z\"的文件解压。如果您之前将所有的附件保存在一个新的文件"
 "夹,仅在那个文件夹里解压所有文件就可以。\n"
 "    "
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 #, fuzzy
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
@@ -286,27 +296,14 @@ msgstr ""
 "核实您接受的所有的该邮件中描述的每个文件包\n"
 "    "
 
-#: lib/gettor/i18n.py:486
-#, fuzzy
+#: lib/gettor/i18n.py:117
 msgid ""
-"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:"
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
-"\n"
-"现在用一个能解压多个卷RAR格式的程序。在Windows环境中通常是WinRAR。如果您没有"
-"在您的电脑上安装该软件,请在这里得到它:\n"
-"    "
-
-#: lib/gettor/i18n.py:490
-#, fuzzy
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
-msgstr ""
-"\n"
-"要解压您的Tor文件包,只需双击”.exe\"文件。\n"
-"    "
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 #, fuzzy
 msgid ""
 "5.) After unpacking is finished, you should find a newly created \n"
@@ -318,7 +315,7 @@ msgstr ""
 "Tor Browser Bundle会在几秒钟内运行。\n"
 "    "
 
-#: lib/gettor/i18n.py:496
+#: lib/gettor/i18n.py:125
 #, fuzzy
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
@@ -326,50 +323,68 @@ msgstr ""
 "就是这样。过程完成。感谢您使用Tor并祝您愉快!\n"
 "    "
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 #, fuzzy
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\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/i18n.py:506
+#: lib/gettor/i18n.py:136
 #, fuzzy
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 "\n"
 "提示:如果您的电脑已安装过GnuPG,在解压文件后请如下使用gpg命令栏工具:\n"
 "    "
 
-#: lib/gettor/i18n.py:509
+#: lib/gettor/i18n.py:143
 #, fuzzy
-msgid "The output should look somewhat like this:"
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 "\n"
 "输出结果应该类似这样:\n"
 "\n"
 "    "
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 #, fuzzy
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
 msgstr ""
 "\n"
 "如果您对命令栏工具不了解,请在这个网站上试着寻找GnuPG适用的用户图形界面:\n"
 "    "
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:155
 #, fuzzy
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
@@ -385,18 +400,20 @@ msgstr ""
 "即使您的ISP过滤了所有通向已知Tor中继的链接,它们可能不会屏蔽所有的桥接。\n"
 "    "
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 #, fuzzy
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 "\n"
 "你可以向这个地址:bridges at torproject.org发送电子邮件以获取一个桥接,需要在正"
 "文中包含\"get bridges\"。\n"
 "    "
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 #, fuzzy
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
@@ -406,7 +423,7 @@ msgstr ""
 "您也可以通过浏览器在以下网址得到桥接:https://bridges.torproject.org/\n"
 "    "
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 #, fuzzy
 msgid ""
 "IMPORTANT NOTE:\n"
@@ -421,7 +438,7 @@ msgstr ""
 "文件夹,接着双击第一个文件解压。\n"
 "    "
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 #, fuzzy
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
@@ -431,23 +448,22 @@ msgstr ""
 "文件包可能不是按顺序接受到!请您确认接受到所有的文件包后在尝试解压他们!\n"
 "    "
 
-#: lib/gettor/i18n.py:536
-#, fuzzy
+#: lib/gettor/i18n.py:179
+#, fuzzy, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 "\n"
 "感谢您的请求。我们已经成功理解。您的请求正在被处理中。您的文件包应该在接下来"
 "的十分钟内传达。\n"
 "    "
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 #, fuzzy
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 "\n"
 "如果文件包没有收到,可能是因为它对于您的电子邮箱提供商来说过于庞大。请试着用"
@@ -455,7 +471,7 @@ msgstr ""
 "而尽量不是tor-im-browser,因为前者更小一点。\n"
 "    "
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 #, fuzzy
 msgid ""
 "Unfortunately we are currently experiencing problems and we can't fulfill\n"
@@ -466,7 +482,7 @@ msgstr ""
 "试解决此问题。\n"
 "    "
 
-#: lib/gettor/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -475,6 +491,196 @@ msgid ""
 "package. Make sure this is what you want."
 msgstr ""
 
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+#, fuzzy
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+"\n"
+"    请回复此邮件(到 gettor at torproject.org),\n"
+"    告诉我任一个在电邮正文中的软件包名称。\n"
+"\n"
+"    "
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    请您发送纯文本格式的邮件。\n"
+#~ "\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#~ msgstr ""
+#~ "\n"
+#~ "只需像这样在您的电子邮件中包含“split\"关键字:\n"
+#~ "    "
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ "    "
+
+#, fuzzy
+#~ msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+#~ msgstr ""
+#~ "\n"
+#~ "要解压您的Tor文件包,只需双击”.exe\"文件。\n"
+#~ "    "
+
 #~ msgid ""
 #~ "\n"
 #~ "    3.) Rename the file ending in \".ex_RENAME\" to end in \".exe\" and \n"
diff --git a/i18n/zh_HK/gettor.po b/i18n/zh_HK/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/zh_HK/gettor.po
+++ b/i18n/zh_HK/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/zh_TW/gettor.po b/i18n/zh_TW/gettor.po
index d463131..e9fd3e7 100644
--- a/i18n/zh_TW/gettor.po
+++ b/i18n/zh_TW/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""
diff --git a/i18n/zu/gettor.po b/i18n/zu/gettor.po
index 5c4039d..1a9ae07 100644
--- a/i18n/zu/gettor.po
+++ b/i18n/zu/gettor.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 00:10+0100\n"
+"POT-Creation-Date: 2011-09-03 13:44+0200\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"
@@ -17,84 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 
-#: lib/gettor/i18n.py:408
-msgid ""
-"Hello, This is the \"GetTor\" robot.\n"
-"\n"
-"Thank you for your request."
+#: lib/gettor/i18n.py:27
+msgid "Hello, This is the \"GetTor\" robot."
+msgstr ""
+
+#: lib/gettor/i18n.py:29
+msgid "Thank you for your request."
 msgstr ""
 
-#: lib/gettor/i18n.py:412
+#: lib/gettor/i18n.py:31
 msgid ""
-" Unfortunately, we won't answer you at this address. You should make\n"
-"an account with GMAIL.COM or YAHOO.CN and send the mail from\n"
+"Unfortunately, we won't answer you at this address. You should make\n"
+"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
 msgstr ""
 
-#: lib/gettor/i18n.py:416
+#: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which 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/i18n.py:420
+#: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn'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/i18n.py:424
-msgid ""
-"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/i18n.py:427 lib/gettor/i18n.py:500
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
 msgid ""
 "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/i18n.py:430
+#: lib/gettor/i18n.py:46
 msgid ""
 "I will mail you a Tor package, if you tell me which one you want.\n"
-"Please select one of the following package names:"
+"Please select one of the following package names:\n"
+"\n"
+"    windows\n"
+"    macos-i386\n"
+"    macos-ppc\n"
+"    linux-i386\n"
+"    linux-x86_64\n"
+"    source"
 msgstr ""
 
-#: lib/gettor/i18n.py:433
+#: lib/gettor/i18n.py:56
 msgid ""
-"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."
+"Please reply to this mail, and tell me a single package name anywhere \n"
+"in the body of your email."
 msgstr ""
 
-#: lib/gettor/i18n.py:436
-msgid " OBTAINING LOCALIZED VERSIONS OF TOR"
+#: lib/gettor/i18n.py:59
+msgid ""
+"OBTAINING LOCALIZED VERSIONS OF TOR\n"
+"==================================="
 msgstr ""
 
-#: lib/gettor/i18n.py:438
+#: lib/gettor/i18n.py:62
 msgid ""
 "To get a version of Tor translated into your language, specify the\n"
-"language you want in the address you send the mail to:"
+"language you want in the address you send the mail to:\n"
+"\n"
+"    gettor+fa at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:441
+#: lib/gettor/i18n.py:67
 msgid ""
 "This example will give you the requested package in a localized\n"
-"version for Chinese. Check below for a list of supported language\n"
+"version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
 msgstr ""
 
-#: lib/gettor/i18n.py:445
+#: lib/gettor/i18n.py:71
 msgid " List of supported locales:"
 msgstr ""
 
-#: lib/gettor/i18n.py:447
+#: lib/gettor/i18n.py:73
 msgid "Here is a list of all available languages:"
 msgstr ""
 
-#: lib/gettor/i18n.py:449
+#: lib/gettor/i18n.py:75
 msgid ""
 "    gettor+ar at torproject.org:     Arabic\n"
 "    gettor+de at torproject.org:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh at torproject.org:     Chinese"
 msgstr ""
 
-#: lib/gettor/i18n.py:461
+#: lib/gettor/i18n.py:87
 msgid "If you select no language, you will receive the English version."
 msgstr ""
 
-#: lib/gettor/i18n.py:463
-msgid "SMALLER SIZED PACKAGES"
+#: lib/gettor/i18n.py:89
+msgid ""
+"SMALLER SIZED PACKAGES\n"
+"======================"
 msgstr ""
 
-#: lib/gettor/i18n.py:465
+#: lib/gettor/i18n.py:92
 msgid ""
-"If your bandwith is low or your provider doesn't allow you to \n"
-"receive large attachments in your email, there is a feature of \n"
-"GetTor you can use to make it send you a number of small packages\n"
-"instead of one big one."
+"If your bandwith is low or your provider doesn't allow you to\n"
+"receive large attachments in your email, GetTor can send you several\n"
+"small packages instead of one big one."
 msgstr ""
 
-#: lib/gettor/i18n.py:470
-msgid "Simply include the keyword 'split' somewhere in your email like so:"
+#: lib/gettor/i18n.py:96
+msgid ""
+"Simply include the keyword 'split' in a new line on its own (this part\n"
+"is important!) like so: \n"
+"        \n"
+"    windows\n"
+"    split"
 msgstr ""
 
-#: lib/gettor/i18n.py:472
+#: lib/gettor/i18n.py:102
 msgid ""
 "Sending this 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/i18n.py:475
+#: lib/gettor/i18n.py:105
 msgid ""
 "After having received all parts, you need to re-assemble them to \n"
 "one package again. This is done as follows:"
 msgstr ""
 
-#: lib/gettor/i18n.py:478
+#: lib/gettor/i18n.py:108
 msgid "1.) Save all received attachments into one folder on your disk."
 msgstr ""
 
-#: lib/gettor/i18n.py:480
+#: lib/gettor/i18n.py:110
 msgid ""
 "2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
-"a fresh folder before, simply unzip all files in that folder."
+"a fresh folder before, simply unzip all files in that folder. If you don't\n"
+"know how to unzip the .z files, please see the UNPACKING THE FILES section."
 msgstr ""
 
-#: lib/gettor/i18n.py:483
+#: lib/gettor/i18n.py:114
 msgid ""
 "3.) Verify all files as described in the mail you received with \n"
 "each package. (gpg --verify)"
 msgstr ""
 
-#: lib/gettor/i18n.py:486
+#: lib/gettor/i18n.py:117
 msgid ""
-"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/i18n.py:490
-msgid "To unpack your Tor package, simply doubleclick the \".exe\" file."
+"4.) Now unpack the multi-volume archive into one file by double-\n"
+"clicking the file ending in \"..split.part01.exe\". This should start the \n"
+"process automatically."
 msgstr ""
 
-#: lib/gettor/i18n.py:492
+#: lib/gettor/i18n.py:121
 msgid ""
 "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/i18n.py:496
+#: lib/gettor/i18n.py:125
 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
 msgstr ""
 
-#: lib/gettor/i18n.py:498
-msgid "SUPPORT"
+#: lib/gettor/i18n.py:127
+msgid ""
+"SUPPORT\n"
+"======="
 msgstr ""
 
-#: lib/gettor/i18n.py:503
+#: lib/gettor/i18n.py:133
 msgid ""
-" Here's your requested software as a zip file. Please unzip the\n"
+"Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
 msgstr ""
 
-#: lib/gettor/i18n.py:506
+#: lib/gettor/i18n.py:136
 msgid ""
-"Hint: If your computer has GnuPG installed, use the gpg\n"
-"commandline tool as follows after unpacking the zip file:"
+"VERIFY SIGNATURE\n"
+"================\n"
+"If your computer has GnuPG installed, use the gpg commandline \n"
+"tool as follows after unpacking the zip file:\n"
+"\n"
+"    gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US."
+"exe"
 msgstr ""
 
-#: lib/gettor/i18n.py:509
-msgid "The output should look somewhat like this:"
+#: lib/gettor/i18n.py:143
+msgid ""
+"The output should look somewhat like this:\n"
+"\n"
+"    gpg: Good signature from 'Erinn Clark <...>'"
 msgstr ""
 
-#: lib/gettor/i18n.py:511
+#: lib/gettor/i18n.py:147
 msgid ""
 "If you're not familiar with commandline tools, try looking for\n"
-"a graphical user interface for GnuPG on this website:"
+"a graphical user interface for GnuPG on this website:\n"
+"\n"
+"    http://www.gnupg.org/related_software/frontends.html"
+msgstr ""
+
+#: lib/gettor/i18n.py:152
+msgid ""
+"BLOCKED ACCESS / CENSORSHIP\n"
+"==========================="
 msgstr ""
 
-#: lib/gettor/i18n.py:514
+#: lib/gettor/i18n.py:155
 msgid ""
 "If your Internet connection blocks access to the Tor network, you\n"
 "may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -215,19 +242,21 @@ msgid ""
 "to block all the bridges."
 msgstr ""
 
-#: lib/gettor/i18n.py:521
+#: lib/gettor/i18n.py:162
 msgid ""
 "You can acquire a bridge by sending an email that contains \"get bridges\"\n"
-"in the body of the email to the following email address:"
+"in the body of the email to the following email address:\n"
+"\n"
+"    bridges at torproject.org"
 msgstr ""
 
-#: lib/gettor/i18n.py:524
+#: lib/gettor/i18n.py:167
 msgid ""
 "It is also possible to fetch bridges with a web browser at the following\n"
 "url: https://bridges.torproject.org/"
 msgstr ""
 
-#: lib/gettor/i18n.py:527
+#: lib/gettor/i18n.py:170
 msgid ""
 "IMPORTANT NOTE:\n"
 "Since this is part of a split-file request, you need to wait for\n"
@@ -236,32 +265,32 @@ msgid ""
 "first file."
 msgstr ""
 
-#: lib/gettor/i18n.py:533
+#: lib/gettor/i18n.py:176
 msgid ""
 "Packages might arrive out of order! Please make sure you received\n"
 "all packages before you attempt to unpack them!"
 msgstr ""
 
-#: lib/gettor/i18n.py:536
+#: lib/gettor/i18n.py:179
+#, python-format
 msgid ""
-"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."
+"Your package (%s) should arrive within the next ten minutes."
 msgstr ""
 
-#: lib/gettor/i18n.py:540
+#: lib/gettor/i18n.py:182
 msgid ""
 "If it 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."
+"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
 msgstr ""
 
-#: lib/gettor/i18n.py:543
+#: lib/gettor/i18n.py:185
 msgid ""
 "Unfortunately we 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/i18n.py:546
+#: lib/gettor/i18n.py:188
 msgid ""
 "Unfortunately there is no split package available for the package you\n"
 "requested. Please send us another package name or request the same package \n"
@@ -269,3 +298,151 @@ msgid ""
 "whole \n"
 "package. Make sure this is what you want."
 msgstr ""
+
+#: lib/gettor/i18n.py:193
+msgid ""
+"UNPACKING THE FILES\n"
+"==================="
+msgstr ""
+
+#: lib/gettor/i18n.py:196
+msgid ""
+"The easiest way to unpack the files you received is to install 7-Zip,\n"
+"a free file compression/uncompression tool. If it isn't installed on\n"
+"your computer yet, you can download it here:\n"
+"\n"
+"    http://www.7-zip.org/"
+msgstr ""
+
+#: lib/gettor/i18n.py:202
+msgid ""
+"When 7-Zip is installed, you can open the .z archive you received from\n"
+"us by double-clicking on it."
+msgstr ""
+
+#: lib/gettor/i18n.py:205
+msgid ""
+"An alternative way to get the .z files extraced is to rename them to\n"
+".zip. For example, if you recevied a file called \"windows.z\", rename it "
+"to \n"
+"\"windows.zip\". You should then be able to extract the archive with "
+"common \n"
+"file archiver programs that probably are already installed on your computer."
+msgstr ""
+
+#: lib/gettor/i18n.py:210
+msgid ""
+"Please reply to this mail, and tell me a single package name anywhere\n"
+"in your reply. Here's a short explanation of what these packages are:"
+msgstr ""
+
+#: lib/gettor/i18n.py:213
+msgid ""
+"windows:\n"
+"The Tor Browser Bundle package for Windows operating systems. If you're \n"
+"running some version of Windows, like Windows XP, Windows Vista or \n"
+"Windows 7, this is the package you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:218
+msgid ""
+"macos-i386:\n"
+"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
+"general, newer Mac hardware will require you to use this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:222
+msgid ""
+"macos-ppc:\n"
+"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
+"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
+msgstr ""
+
+#: lib/gettor/i18n.py:226
+msgid ""
+"linux-i386:\n"
+"The Tor Browser Bundle package for Linux, 32bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:229
+msgid ""
+"Note that this package is rather large and needs your email provider to \n"
+"allow for attachments of about 30MB in size."
+msgstr ""
+
+#: lib/gettor/i18n.py:232
+msgid ""
+"linux-x86_64:\n"
+"The Tor Browser Bundle package for Linux, 64bit versions."
+msgstr ""
+
+#: lib/gettor/i18n.py:235
+msgid ""
+"source:\n"
+"The Tor source code, for experts. Most users do not want this package."
+msgstr ""
+
+#: lib/gettor/i18n.py:238
+msgid ""
+"FREQUENTLY ASKED QUESTIONS\n"
+"=========================="
+msgstr ""
+
+#: lib/gettor/i18n.py:241
+msgid "What is Tor?"
+msgstr ""
+
+#: lib/gettor/i18n.py:243
+msgid "The name \"Tor\" can refer to several different components."
+msgstr ""
+
+#: lib/gettor/i18n.py:245
+msgid ""
+"The Tor software is a program you can run on your computer that helps \n"
+"keep you safe on the Internet. Tor protects you by bouncing your \n"
+"communications around a distributed network of relays run by volunteers \n"
+"all around the world: it prevents somebody watching your Internet "
+"connection \n"
+"from learning what sites you visit, and it prevents the sites you visit "
+"from \n"
+"learning your physical location. This set of volunteer relays is called "
+"the \n"
+"Tor network. You can read more about how Tor works here:\n"
+"\n"
+"    https://www.torproject.org/about/overview.html.en"
+msgstr ""
+
+#: lib/gettor/i18n.py:255
+msgid "What is the Tor Browser Bundle?"
+msgstr ""
+
+#: lib/gettor/i18n.py:257
+msgid ""
+"The Browser Bundle (TBB) is the package we recommend to most users. \n"
+"The bundle comes with everything you need to safely browse the Internet.\n"
+"Just extract it and run."
+msgstr ""
+
+#: lib/gettor/i18n.py:261
+msgid "What package should I request?"
+msgstr ""
+
+#: lib/gettor/i18n.py:263
+msgid ""
+"This depends on the operating system you use. For instance, if your\n"
+"operating system is Microsoft Windows, you should request \"windows\". Here\n"
+"is a short explanation of all packages to request and what operating \n"
+"systems there are suitable for:"
+msgstr ""
+
+#: lib/gettor/i18n.py:268
+msgid "How do I extract the file(s) you sent me?"
+msgstr ""
+
+#: lib/gettor/i18n.py:270
+msgid "QUESTION:"
+msgstr ""
+
+#: lib/gettor/i18n.py:272
+msgid "ANSWER:"
+msgstr ""





More information about the tor-commits mailing list