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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [gettor/master] Add modified translation strings to .po files
From: kaner@xxxxxxxxxxxxxx
Date: Sat, 3 Sep 2011 12:35:54 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 03 Sep 2011 08:38:41 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: code repository commits <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Christian Fromme <kaner@xxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx

commit e1ac870c2aea76beee83b3411ad58351051b1790
Author: Christian Fromme <kaner@xxxxxxxxxx>
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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx )Ø? Ù?Ø£Ù? ØªØ®Ø¨Ø±Ù?Ù?\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx )Ø? Ù?Ø£Ù? ØªØ®Ø¨Ø±Ù?Ù?\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxxxx) 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
@@ -210,7 +216,7 @@ msgstr ""
 "gettor+zh@xxxxxxxxxxxxxx: Ã?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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxxxx) 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxx>, 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@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
-
-#: lib/gettor/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@xxxxxxxxxxxxxx"
-msgstr ""
-"\n"
-"    á?¡á??á??á?¹á??á??á?ºá?¬á?¸ á??á??á?¹á?·á??á?½á?¬ á?±á??á?¸á??á??á?¬ á?±á??á?¸á??á?¼á??á?¹á?¸á??á?½á?á??á??á?¹á??á?² á?»á??á??á?¹á?»á??á??á?¹ á?¡á??á?¯á??á?¹á??á??á?¯á??á?¹á??á?á?¯á??á??á?² á?»á??á??á?¹á?»á??á??á?¹\n"
-"    á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?á??á?¹á??á?¬ : tor-assistants@xxxxxxxxxxxxxx á??á?á?¯á??á??á?¹á??á?¼á??á?¹á??á?á?¯á??á?¹á??á?«á??á??á?¹á??\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@xxxxxxxxxxxxxx), and tell me\n"
-"a single package name anywhere in the body of your email."
-msgstr ""
-"\n"
-"    á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? (gettor@xxxxxxxxxxxxxx) á??á?á?¯ á?¡á?±á?¾á??á?¬á??á?¹á?¸á?»á??á??á?¹á??á?«á??\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@xxxxxxxxxxxxxx:     Arabic\n"
-"    gettor+de@xxxxxxxxxxxxxx:     German\n"
-"    gettor+en@xxxxxxxxxxxxxx:     English\n"
-"    gettor+es@xxxxxxxxxxxxxx:     Spanish\n"
-"    gettor+fa@xxxxxxxxxxxxxx:     Farsi (Iran)\n"
-"    gettor+fr@xxxxxxxxxxxxxx:     French\n"
-"    gettor+it@xxxxxxxxxxxxxx:     Italian\n"
-"    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
-"    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
-"    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
-msgstr ""
-"\n"
-"    gettor+ar@xxxxxxxxxxxxxx:     Arabic\n"
-"    gettor+de@xxxxxxxxxxxxxx:     German\n"
-"    gettor+en@xxxxxxxxxxxxxx:     English\n"
-"    gettor+es@xxxxxxxxxxxxxx:     Spanish\n"
-"    gettor+fa@xxxxxxxxxxxxxx:     Farsi (Iran)\n"
-"    gettor+fr@xxxxxxxxxxxxxx:     French\n"
-"    gettor+it@xxxxxxxxxxxxxx:     Italian\n"
-"    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
-"    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
-"    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese\n"
-"\n"
-"    "
-
-#: 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@xxxxxxxxxxxxxx\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@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), à¦?à¦¬à¦? à¦?à¦®à¦¾à¦?à§? "
@@ -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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), à¦?à¦¬à¦? à¦?à¦®à¦¾à¦?à§? "
+"à¦?à¦¾à¦¨à¦¾à¦¨\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -116,103 +129,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx) 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx) 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -115,103 +128,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx)Ù¾Ø§Ø³Ø®Û? Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯ Ù? Ù?Ø§Ù? Û?Ú© Ø¨Ø³ØªÙ? Û?\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 msgstr ""
 "\n"
 "Ø¨Ø§ Ø§Ø±Ø³Ø§Ù? Û?Ú© Ø§Û?Ù?Û?Ù? Ø¨Ù? Ø¢Ø¯Ø±Ø³: bridges@xxxxxxxxxxxxxx Ú©Ù? Ú©Ù?Ù?Ù? Û? \"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@xxxxxxxxxxxxxx)Ù¾Ø§Ø³Ø®Û? Ø§Ø±Ø³Ø§Ù? Ú©Ù?Û?Ø¯ Ù? Ù?Ø§Ù? Û?Ú© Ø¨Ø³ØªÙ? Û?\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx)\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx)\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
@@ -192,7 +198,7 @@ msgstr ""
 "gettor+zh@xxxxxxxxxxxxxx: 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx)ã?«è¿?ä¿¡ã??ã?¦ã??\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -169,7 +182,7 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx)ã?«è¿?ä¿¡ã??ã?¦ã??\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -138,103 +151,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@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@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
-
-#: lib/gettor/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@xxxxxxxxxxxxxx"
-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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx:     Arabic\n"
-"    gettor+de@xxxxxxxxxxxxxx:     German\n"
-"    gettor+en@xxxxxxxxxxxxxx:     English\n"
-"    gettor+es@xxxxxxxxxxxxxx:     Spanish\n"
-"    gettor+fa@xxxxxxxxxxxxxx:     Farsi (Iran)\n"
-"    gettor+fr@xxxxxxxxxxxxxx:     French\n"
-"    gettor+it@xxxxxxxxxxxxxx:     Italian\n"
-"    gettor+nl@xxxxxxxxxxxxxx:     Dutch\n"
-"    gettor+pl@xxxxxxxxxxxxxx:     Polish\n"
-"    gettor+ru@xxxxxxxxxxxxxx:     Russian\n"
-"    gettor+zh@xxxxxxxxxxxxxx:     Chinese"
-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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -108,103 +114,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -123,103 +136,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx, Ñ?ÐºÐ°Ð·Ð°Ð²\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx, Ñ?ÐºÐ°Ð·Ð°Ð²\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx, "
@@ -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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx, "
+"Ð¸\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -160,103 +165,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx, Ñ?Ð° Ð½Ð°Ð¿Ð¸Ñ?Ñ?Ñ?Ñ? Ð¼ÐµÐ½Ñ? Ð½Ð°Ð·Ð²Ñ? Ð¿Ð°ÐºÐµÑ?Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ Ð´ÐµÑ?Ñ? Ð½Ð° "
+"Ð¿Ð¾Ñ?Ð°Ñ?ÐºÑ?\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx). Ú©Û?Û?Úº Ø¨Ú¾Û? "
 "Ø¢Ù¾ Ú©Û? Ø§Û? Ù?Û?Ù? Ù?Û?Úº Ø§Û?Ú© Ù¾Û?Ú©Û?Ø¬ Ú©Ø§ Ù?Ø§Ù?. \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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
@@ -178,7 +183,7 @@ msgstr ""
 "+zh@xxxxxxxxxxxxxx\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@xxxxxxxxxxxxxx"
 msgstr ""
 "\n"
 "Ø¢Ù¾ Ø§Ø³ Ø§Û? Ù?Û?Ù? Ø§Û?Ú?Ø±Û?Ø³ : bridges@xxxxxxxxxxxxxx Ù¾Ø±Ø§Û?Ú© Ø§Û? Ù?Û?Ù? Ø¨Û?Ø¬Ú¾ Ú©Ø±Ù¾Ù? ØØ§ØµÙ? Ú©Ø± "
 "Ø³Ú©ØªÛ? Û?Û?Úº Ø? Ø¬Ø³ Ù?Û?Úº Ù?Ú©Ú¾Ø§ Û?Ù?\"Ù¾Ù? ØØ§ØµÙ? Ú©Ø±Ù?\"\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@xxxxxxxxxxxxxx). Ú©Û?Û?Úº Ø¨Ú¾Û? "
+"Ø¢Ù¾ Ú©Û? Ø§Û? Ù?Û?Ù? Ù?Û?Úº Ø§Û?Ú© Ù¾Û?Ú©Û?Ø¬ Ú©Ø§ Ù?Ø§Ù?. \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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -108,103 +114,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxxï¼?ï¼?\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 msgstr ""
 "\n"
 "ä½ å?¯ä»¥å??è¿?ä¸ªå?°å??ï¼?bridges@xxxxxxxxxxxxxxå??é??ç?µå?é?®ä»¶ä»¥è?·å??ä¸?ä¸ªæ¡¥æ?¥ï¼?é??è¦?å?¨æ£"
 "æ??ä¸å??å?«\"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@xxxxxxxxxxxxxxï¼?ï¼?\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx), 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@xxxxxxxxxxxxxx"
 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@xxxxxxxxxxxxxx:     Arabic\n"
 "    gettor+de@xxxxxxxxxxxxxx:     German\n"
@@ -109,103 +115,124 @@ msgid ""
 "    gettor+zh@xxxxxxxxxxxxxx:     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@xxxxxxxxxxxxxx"
 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 ""

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

Prev by Author: [tor-commits] [gettor/master] Merge branch 'improve_usability'
Next by Author: [tor-commits] [gettor/master] Minor fix in package handling
Previous by thread: [tor-commits] [gettor/master] Merge branch 'improve_usability'
Next by thread: [tor-commits] [gettor/master] Minor fix in package handling
Index(es):
- Author
- Thread