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

[tor-commits] [translation/bridgedb] Update translations for bridgedb

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/bridgedb] Update translations for bridgedb
From: translation@xxxxxxxxxxxxxx
Date: Sat, 26 Jul 2014 09:46:36 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 26 Jul 2014 05:47:34 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: 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: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 6981c30bbe973b284806398f0d88d7139626c869
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Sat Jul 26 09:46:29 2014 +0000

    Update translations for bridgedb
---
 ach/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 ady/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 af/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 ak/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 am/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 ar/LC_MESSAGES/bridgedb.po          |   20 ++---
 arn/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 ast/LC_MESSAGES/bridgedb.po         |  136 ++++++++++++++++++--------------
 az/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 be/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 bg/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 bn/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 bn_IN/LC_MESSAGES/bridgedb.po       |  136 ++++++++++++++++++--------------
 bo/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 br/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 bs/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 ca/LC_MESSAGES/bridgedb.po          |  140 +++++++++++++++++++--------------
 cs/LC_MESSAGES/bridgedb.po          |   18 ++---
 csb/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 cv/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 cy/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 da/LC_MESSAGES/bridgedb.po          |  144 ++++++++++++++++++++--------------
 de/LC_MESSAGES/bridgedb.po          |   20 ++---
 dz/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 el/LC_MESSAGES/bridgedb.po          |   20 ++---
 en_GB/LC_MESSAGES/bridgedb.po       |  136 ++++++++++++++++++--------------
 eo/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 es/LC_MESSAGES/bridgedb.po          |   20 ++---
 es_AR/LC_MESSAGES/bridgedb.po       |  134 +++++++++++++++++++-------------
 es_CL/LC_MESSAGES/bridgedb.po       |  136 ++++++++++++++++++--------------
 es_CO/LC_MESSAGES/bridgedb.po       |  134 +++++++++++++++++++-------------
 es_MX/LC_MESSAGES/bridgedb.po       |  134 +++++++++++++++++++-------------
 et/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 eu/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 fa/LC_MESSAGES/bridgedb.po          |   20 ++---
 fi/LC_MESSAGES/bridgedb.po          |   20 ++---
 fil/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 fo/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 fr/LC_MESSAGES/bridgedb.po          |   20 ++---
 fr_CA/LC_MESSAGES/bridgedb.po       |   20 ++---
 fur/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 fy/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 ga/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 gl/LC_MESSAGES/bridgedb.po          |  138 +++++++++++++++++++--------------
 gu/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 gu_IN/LC_MESSAGES/bridgedb.po       |  134 +++++++++++++++++++-------------
 gun/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 ha/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 he/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 hi/LC_MESSAGES/bridgedb.po          |   18 ++---
 hr/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 hr_HR/LC_MESSAGES/bridgedb.po       |   20 ++---
 ht/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 hu/LC_MESSAGES/bridgedb.po          |   22 +++---
 hy/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 hy_AM/LC_MESSAGES/bridgedb.po       |  134 +++++++++++++++++++-------------
 ia/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 id/LC_MESSAGES/bridgedb.po          |   18 ++---
 is/LC_MESSAGES/bridgedb.po          |   18 ++---
 it/LC_MESSAGES/bridgedb.po          |  138 +++++++++++++++++++--------------
 ja/LC_MESSAGES/bridgedb.po          |  142 ++++++++++++++++++++--------------
 jv/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 ka/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 kk/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 km/LC_MESSAGES/bridgedb.po          |   20 ++---
 kn/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 ko/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 ko_KR/LC_MESSAGES/bridgedb.po       |  136 ++++++++++++++++++--------------
 ku/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 kw/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 ky/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 lb/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 lg/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 ln/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 lo/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 lt/LC_MESSAGES/bridgedb.po          |   18 ++---
 lv/LC_MESSAGES/bridgedb.po          |   20 ++---
 mg/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 mi/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 mk/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 ml/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 mn/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 mr/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 ms_MY/LC_MESSAGES/bridgedb.po       |  136 ++++++++++++++++++--------------
 mt/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 my/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 nah/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 nap/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 nb/LC_MESSAGES/bridgedb.po          |  138 +++++++++++++++++++--------------
 nds/LC_MESSAGES/bridgedb.po         |  136 ++++++++++++++++++--------------
 ne/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 nl/LC_MESSAGES/bridgedb.po          |  146 ++++++++++++++++++++---------------
 nl_BE/LC_MESSAGES/bridgedb.po       |  134 +++++++++++++++++++-------------
 nn/LC_MESSAGES/bridgedb.po          |   18 ++---
 nso/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 oc/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 or/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 pa/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 pap/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 pl/LC_MESSAGES/bridgedb.po          |   20 ++---
 pms/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 ps/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 pt/LC_MESSAGES/bridgedb.po          |   20 ++---
 pt_BR/LC_MESSAGES/bridgedb.po       |   20 ++---
 ro/LC_MESSAGES/bridgedb.po          |   22 +++---
 ru/LC_MESSAGES/bridgedb.po          |   20 ++---
 ru@petr1708/LC_MESSAGES/bridgedb.po |  136 ++++++++++++++++++--------------
 scn/LC_MESSAGES/bridgedb.po         |   18 ++---
 sco/LC_MESSAGES/bridgedb.po         |  136 ++++++++++++++++++--------------
 si_LK/LC_MESSAGES/bridgedb.po       |  136 ++++++++++++++++++--------------
 sk/LC_MESSAGES/bridgedb.po          |   18 ++---
 sk_SK/LC_MESSAGES/bridgedb.po       |   20 ++---
 sl/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 sl_SI/LC_MESSAGES/bridgedb.po       |  136 ++++++++++++++++++--------------
 sn/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 so/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 son/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 sq/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 sr/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 sr@latin/LC_MESSAGES/bridgedb.po    |  136 ++++++++++++++++++--------------
 st/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 su/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 sv/LC_MESSAGES/bridgedb.po          |   20 ++---
 sw/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 szl/LC_MESSAGES/bridgedb.po         |  134 +++++++++++++++++++-------------
 ta/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 te/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 te_IN/LC_MESSAGES/bridgedb.po       |  134 +++++++++++++++++++-------------
 templates/bridgedb.pot              |  136 ++++++++++++++++++--------------
 tg/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 th/LC_MESSAGES/bridgedb.po          |   18 ++---
 ti/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 tk/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 tr/LC_MESSAGES/bridgedb.po          |   20 ++---
 uk/LC_MESSAGES/bridgedb.po          |  142 ++++++++++++++++++++--------------
 ur/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 ur_PK/LC_MESSAGES/bridgedb.po       |  136 ++++++++++++++++++--------------
 uz/LC_MESSAGES/bridgedb.po          |  136 ++++++++++++++++++--------------
 ve/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 vi/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 wa/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 wo/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 zh_CN/LC_MESSAGES/bridgedb.po       |   20 ++---
 zh_HK/LC_MESSAGES/bridgedb.po       |  134 +++++++++++++++++++-------------
 zh_TW/LC_MESSAGES/bridgedb.po       |   20 ++---
 zu/LC_MESSAGES/bridgedb.po          |  134 +++++++++++++++++++-------------
 146 files changed, 9455 insertions(+), 6695 deletions(-)

diff --git a/ach/LC_MESSAGES/bridgedb.po b/ach/LC_MESSAGES/bridgedb.po
index e66451f..ea5d240 100644
--- a/ach/LC_MESSAGES/bridgedb.po
+++ b/ach/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/torproject/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ady/LC_MESSAGES/bridgedb.po b/ady/LC_MESSAGES/bridgedb.po
index 90374d0..2782953 100644
--- a/ady/LC_MESSAGES/bridgedb.po
+++ b/ady/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/torproject/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/af/LC_MESSAGES/bridgedb.po b/af/LC_MESSAGES/bridgedb.po
index c6a9d12..1296db7 100644
--- a/af/LC_MESSAGES/bridgedb.po
+++ b/af/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ak/LC_MESSAGES/bridgedb.po b/ak/LC_MESSAGES/bridgedb.po
index c34bbdd..5a8251f 100644
--- a/ak/LC_MESSAGES/bridgedb.po
+++ b/ak/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/torproject/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/am/LC_MESSAGES/bridgedb.po b/am/LC_MESSAGES/bridgedb.po
index c476eb6..771ade9 100644
--- a/am/LC_MESSAGES/bridgedb.po
+++ b/am/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Amharic (http://www.transifex.com/projects/p/torproject/language/am/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index 9fd4f2f..fc410f0 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-20 05:50+0000\n"
-"Last-Translator: Sherief Alaa <sheriefalaa.w@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr "Ù?Ø±ØØ¨Ø§Ø? %s "
 msgid "Hello, friend!"
 msgstr "Ù?Ø±ØØ¨Ø§ ,ØµØ¯Ù?Ù?Ù?!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Ù?Ù?Ø§ØªÙ?Ø Ø¹Ø§Ù?Ø©"
 
@@ -150,8 +150,8 @@ msgstr "Ø£ØØªØ§Ø¬ Ø¥Ù?Ù? Ù?Ø³Ù?Ù?Ø© Ø¨Ø¯Ù?Ù?Ø© Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? bridges!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Ù?Ù?Ø·Ø±Ù?Ù?Ø© Ø£Ø®Ø±Ù? Ù?Ù?ØØµÙ?Ù? Ø¹Ù?Ù? bridges Ù?Ù? Ø§Ù? ØªØ±Ø³Ù? Ø¨Ø±Ù?Ø¯ Ø§Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¥Ù?Ù? %s. Ù?Ø±Ø¬Ù? Ù?Ù?Ø§ØØ¸Ø© Ø£Ù?Ù? Ù?Ø¬Ø¨ Ø¥Ø±Ø³Ø§Ù? Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? Ø¹Ù?Ù?Ø§Ù? Ù?Ù? Ø£ØØ¯ Ù?Ø²Ù?Ø¯Ù? Ø®Ø¯Ù?Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ø¯ Ø§Ù?Ø¥Ù?Ù?ØªØ±Ù?Ù?Ù? Ø§Ù?ØªØ§Ù?Ù?Ù?Ù?: %s Ø§Ù? %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -263,19 +263,19 @@ msgstr "Ø£Ø·Ù?Ø¨ Pluggable Transport Ø¨Ù? TYPE"
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ø§ØØµÙ? Ø¹Ù?Ù? Ù?Ø³Ø®Ø© Ù?Ù? Ù?Ù?ØªØ§Ø GnuPG Ø§Ù?Ø¹Ø§Ù? Ø§Ù?Ø®Ø§Øµ Ø¨Ù?BridgeDB"
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ø§Ø¨Ù?Øº Ø¹Ù? Ø®Ø·Ø£ Ø¨Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Ù?Ù?Ø¯ Ø§Ù?Ø¨Ø±Ù?Ø§Ù?Ø¬"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Ø§Ù?ØªØºÙ?Ù?Ø±Ø§Øª"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Ø§ØªØµÙ? Ø¨Ù?Ø§"
 
diff --git a/arn/LC_MESSAGES/bridgedb.po b/arn/LC_MESSAGES/bridgedb.po
index 5af6d86..0fc785c 100644
--- a/arn/LC_MESSAGES/bridgedb.po
+++ b/arn/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Mapudungun (http://www.transifex.com/projects/p/torproject/language/arn/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ast/LC_MESSAGES/bridgedb.po b/ast/LC_MESSAGES/bridgedb.po
index 6a41f1c..4f3976b 100644
--- a/ast/LC_MESSAGES/bridgedb.po
+++ b/ast/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/torproject/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Non"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/az/LC_MESSAGES/bridgedb.po b/az/LC_MESSAGES/bridgedb.po
index 0711585..c06b8ff 100644
--- a/az/LC_MESSAGES/bridgedb.po
+++ b/az/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Xeyr"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po
index c35e4c0..7d1af87 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/torproject/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po
index 3068ed0..ad09443 100644
--- a/bg/LC_MESSAGES/bridgedb.po
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po
index 1a90624..d7743b9 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Bengali (http://www.transifex.com/projects/p/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/bn_IN/LC_MESSAGES/bridgedb.po b/bn_IN/LC_MESSAGES/bridgedb.po
index f7b4e24..0f2e754 100644
--- a/bn_IN/LC_MESSAGES/bridgedb.po
+++ b/bn_IN/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/torproject/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/bo/LC_MESSAGES/bridgedb.po b/bo/LC_MESSAGES/bridgedb.po
index 180b59a..cf1d442 100644
--- a/bo/LC_MESSAGES/bridgedb.po
+++ b/bo/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Tibetan (http://www.transifex.com/projects/p/torproject/language/bo/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/br/LC_MESSAGES/bridgedb.po b/br/LC_MESSAGES/bridgedb.po
index f846390..bfc0901 100644
--- a/br/LC_MESSAGES/bridgedb.po
+++ b/br/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Breton (http://www.transifex.com/projects/p/torproject/language/br/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Petra eo ar pontoÃ¹ ?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/bs/LC_MESSAGES/bridgedb.po b/bs/LC_MESSAGES/bridgedb.po
index cd16e40..c1a968e 100644
--- a/bs/LC_MESSAGES/bridgedb.po
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/torproject/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ne"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po
index 745c189..71eb1e5 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Illenc <provisionalib@xxxxxxxxxxx>, 2013
-# ELOI95, 2014
+# Albert <provisionalib@xxxxxxxxxxx>, 2013
+# Eloi GarcÃa i Fargas, 2014
 # Humbert <humbert.costas@xxxxxxxxx>, 2014
 # Toni Hermoso Pulido <toniher@xxxxxxxxxxxxxx>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-02 09:42+0000\n"
-"Last-Translator: Humbert <humbert.costas@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,19 +24,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "Perdoni! Quelcom ha anat malament amb la seva peticiÃ³."
 
@@ -60,39 +57,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (combina COMMANDs per especificar les mÃºltiples opcions simultÃ niament)"
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "Benvingut a BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr "Actualment suportant transport TYPEs:"
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ei, %s!"
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr "Hola, amic!"
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Claus PÃºbliques"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant MartÃ i espurnes\nper %s a %s en %s."
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,14 +104,20 @@ msgid ""
 "\n"
 msgstr "BridgeDB pot proveÃ¯r ponts amb diversos %stypes de Pluggable Transports%s,\nque pot provocar ofuscacions a la teva connexiÃ³ a Tor Network, fent-ho mÃ©s difÃcil per a qualsevol veient el teu trÃ fic de connexiÃ³ a internet de determinar que estÃ s\nusant Tor.\n"
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -118,96 +126,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "QuÃ¨ sÃ³n els ponts?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Necessit una manera alternativa d'obtenir ponts"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "No em funcionen els ponts! Ajuda!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Si el teu Tor no funciona, hauries d'enviar un correu a %s."
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "Si us plau, selÂ·leccioni les opcions pel tipus de pont:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "Necessites adreces IPv6?"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Necessites un %s?"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "El seu navegador no estÃ  mostrant les imatges correctament."
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr "Introdueixi els carÃ cters de la imatge superior..."
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -215,52 +231,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "Mostra aquest missatge."
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "Demanar ponts estÃ ndard."
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "Demanar ponts IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Demanar un Pluggable Transport per TYPE."
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Fer una cÃ²pia de la clau pÃºblica GnuPG del BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Comunicar un Bug"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Codi font"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Canviar el log"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contacte"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr "Ueeeee, spaghetiiiiis!!!!"
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "No hi han ponts disponibles en aquests moments..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -301,28 +326,27 @@ msgstr "Ara %s adjunta els ponts al Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust donem els meus bridges!"
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "Opcions AvanÃ§ades"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "No"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "Cap"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -330,7 +354,7 @@ msgstr "%sY%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 09d2633..a013046 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-29 13:31+0000\n"
-"Last-Translator: mxsedlacek\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +77,7 @@ msgstr "Hey, %s!"
 msgid "Hello, friend!"
 msgstr "Ahoj, pÅ?Ãteli!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "VeÅ?ejnÃ© klÃÄ?e"
 
@@ -145,7 +145,7 @@ msgstr "Chci mosty zjistit jinÃ½m zpÅ¯sobem!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -258,19 +258,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "NahlÃ¡sit chybu"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "ZdrojovÃ½ kÃ³d"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Seznam zmÄ?n"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontakt"
 
diff --git a/csb/LC_MESSAGES/bridgedb.po b/csb/LC_MESSAGES/bridgedb.po
index 6ed0972..a71350f 100644
--- a/csb/LC_MESSAGES/bridgedb.po
+++ b/csb/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Kashubian (http://www.transifex.com/projects/p/torproject/language/csb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/cv/LC_MESSAGES/bridgedb.po b/cv/LC_MESSAGES/bridgedb.po
index b258f89..655bae9 100644
--- a/cv/LC_MESSAGES/bridgedb.po
+++ b/cv/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Ð?Ð¸Ð¼Ð° <rastamaf@xxxxxxxxx>, 2014
+# Ð¥Ä?Ð¹Ñ?Ð¸ÐºÐºÐ¸ <rastamaf@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Chuvash (http://www.transifex.com/projects/p/torproject/language/cv/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Ð?Ä?Ð½Ð»Ðµ ÐºÄ?Ð¿ÐµÑ?Ñ?ÐµÐ¼?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ð°Ð½Ð° Ñ?Ñ?Ä?Ñ? Ã§Ñ?Ð» ÐºÄ?Ð¿ÐµÑ? Ñ?Ä?Ñ?ÐµÐºÄ?Ñ?ÐµÐ¼ ÐºÐ¸Ñ?Ð»Ä?!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ã?Ñ?Ðº"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/cy/LC_MESSAGES/bridgedb.po b/cy/LC_MESSAGES/bridgedb.po
index 8415688..65fd00d 100644
--- a/cy/LC_MESSAGES/bridgedb.po
+++ b/cy/LC_MESSAGES/bridgedb.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# huwwaters <huwwaters@xxxxxxxxx>, 2014
+# Huw Waters <huwwaters@xxxxxxxxx>, 2014
 # littlegreykida <theinfinitygap@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n"
 "MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -58,39 +55,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Beth yw pontydd?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Rwyf yn angen ffordd arall i cael gafael ar pontydd!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Nid yw fy mhontydd yn gweithio! Rwyf yn angen help!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Na"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po
index 4143b67..e74f8f5 100644
--- a/da/LC_MESSAGES/bridgedb.po
+++ b/da/LC_MESSAGES/bridgedb.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# autofunk78 <villum@xxxxxxxxxxx>, 2014
-# DavidNielsen <gnomeuser@xxxxxxxxx>, 2014
+# Christian Villum <villum@xxxxxxxxxxx>, 2014
+# David Nielsen <gnomeuser@xxxxxxxxx>, 2014
 # OliverMller <theoliver@xxxxxxxxxx>, 2011
-# torebjornson <tore.bjornson@xxxxxxxxx>, 2013
+# Tore BjÃ¸rnson <tore.bjornson@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-21 19:03+0000\n"
-"Last-Translator: autofunk78 <villum@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,19 +24,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "Undskyld, noget gik galt med din anmodning."
 
@@ -60,39 +57,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (Kombiner COMMANDs for at specifierer adskillige valgmuligheder pÃ¥ en gang)"
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "Velkommen til BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr "Transport TYPEs som er understÃ¸ttet i Ã¸jeblikket:"
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hej %s!"
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr "Hej min ven!"
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸gler"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr "Denne email til %s blev skabt ved hjÃ¦lp af regnbuer, enhjÃ¸rninger og glitter %s klokken %s."
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,14 +104,20 @@ msgid ""
 "\n"
 msgstr "BridgeDB kan formidle broer med adskillige typer %sPluggable Transports%s som kan hjÃ¦lpe med at slÃ¸re dine forbindelser til Tor netvÃ¦rket, og dermed gÃ¸re det vanskeligere for nogen som kan se din internet trafik at bestemme at du bruger Tor.\n"
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr "Nogle broer med IPv6 adresser er ogsÃ¥ tilgÃ¦ngelige, men ikke alle Pluggable\nTransports understÃ¸tter IPv6.\n\n"
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -118,96 +126,104 @@ msgid ""
 "\n"
 msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen Pluggable Transports %s hvilket mÃ¥ske ikke lyder sÃ¥ smart, men de kan stadigvÃ¦k hjÃ¦lpe med at omgÃ¥ internet censur i mange tilfÃ¦lde.\n"
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Hvad er broer?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s broer %s er Tor relÃ¦er som hjÃ¦lper dig med at omgÃ¥ censur."
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Jeg har brug for en alternativ metode til at fÃ¥ broer pÃ¥!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "En anden mÃ¥de at finde broer er at sende en email til %s. BemÃ¦rk venligst at du skal\nsende emailen fra en konto hos en af de fÃ¸lgende email udbydere:\n%s eller %s."
+"%s, %s or %s."
+msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Mine broer virker ikke! Jeg har brug for hjÃ¦lp!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Hvis Tor ikke virker for dig kan du  sende en email til %s."
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "PrÃ¸v at inkluderer sÃ¥ meget information om din sag som muligt, der i blandt: En liste af broer og Pluggable Transports du har prÃ¸vet at bruge, din Tor Browser version, hvilke beskeder Tor gav, etc."
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro linjer:"
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr "Find broer!"
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "VÃ¦lg venligst brotype muligheder:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "Har du brug for IPv6 adresser?"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Har du brug for en %s?"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "Din browser kan ikke vise billeder korrekt."
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr "Indtast tegnene fra billedet ovenfor..."
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr "SÃ¥dan starter du med at bruge dine broer"
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr "For at tilfÃ¸je broer til Tor Browseren, fÃ¸lg instruktionerne pÃ¥ %s Tor\nBrowserens hjemmeside %s for at starte Tor Browser."
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "NÃ¥r 'Tor netvÃ¦rksindstillinger' vinduet popper op, klik 'Indstil' og fÃ¸lg guiden til den siger:"
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokerer eller pÃ¥ anden vis censurerer din internetudbyder forbindelser\ntil Tor netvÃ¦rket?"
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -215,52 +231,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "VÃ¦lg 'Ja' og klik sÃ¥ pÃ¥ 'NÃ¦ste'. For at konfigurere dine nye broer, kopier og indsÃ¦t brolinierne i den nÃ¦ste input boks. Klik til sidst 'Forbind', og sÃ¥ er du klar! Hvis du stÃ¸der pÃ¥ problemer, sÃ¥ prÃ¸v at klikke pÃ¥ 'HjÃ¦lp'-knappen i 'Tor NetvÃ¦rksindstillinger'-guiden for at fÃ¥ yderligere hjÃ¦lp."
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "Vis denne besked."
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "Anmod almindelige broer."
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "Amod IPv6 broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Anmod om Pluggable Transport efter TYPE."
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nÃ¸gle."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapporter en fejl"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Kildekode"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Ã?ndringer"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontakt"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr "Ups, vi stÃ¥r i lort til halsen"
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "Der er i Ã¸jeblikket ingen tilgÃ¦ngelige broer..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -301,28 +326,27 @@ msgstr "TilfÃ¸j nu %s broer til Tor Browseren %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sare giv mig bridges!"
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "Advancerede indstillinger"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Nej"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -330,7 +354,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sH%sent Bridges"
diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po
index 5f447f2..765d219 100644
--- a/de/LC_MESSAGES/bridgedb.po
+++ b/de/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-02 14:31+0000\n"
-"Last-Translator: Tobias Bannert\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +77,7 @@ msgstr "Hallo, %s!"
 msgid "Hello, friend!"
 msgstr "Hallo Freund!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Ã?ffentliche SchlÃ¼ssel"
 
@@ -145,8 +145,8 @@ msgstr "Ich brauche einen alternativen Weg, um BrÃ¼cken zu erhalten!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Eine weitere MÃ¶glichkeit, um BrÃ¼cken zu erhalten, ist eine E-Mail an %s zu senden. \nBitte beachte Sie, dass Sie die E-Mail von einem der folgenden E-Mail-Anbieter versenden: \n%s oder %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -258,19 +258,19 @@ msgstr "Einen anschlieÃ?baren Transporttypen nach Typ anfordern."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Eine Kopie des Ã¶ffentlichen GnuPG-SchlÃ¼ssels der BrÃ¼ckendatenbank erhalten."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Einen Fehler melden"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Quellcode"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Ã?nderungsprotokoll"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontakt"
 
diff --git a/dz/LC_MESSAGES/bridgedb.po b/dz/LC_MESSAGES/bridgedb.po
index a7428b8..68a644e 100644
--- a/dz/LC_MESSAGES/bridgedb.po
+++ b/dz/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Dzongkha (http://www.transifex.com/projects/p/torproject/language/dz/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po
index e20412b..864c1f2 100644
--- a/el/LC_MESSAGES/bridgedb.po
+++ b/el/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-16 22:10+0000\n"
-"Last-Translator: isv31 <ix4svs@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +79,7 @@ msgstr "Î?ÎµÎ¹Î¬ Ï?Î¿Ï?, %s!"
 msgid "Hello, friend!"
 msgstr "Î?ÎµÎ¹Î± Ï?Î¿Ï?, Ï?Î¯Î»Îµ!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Î?Î·Î¼Ï?Ï?Î¹Î± Î?Î»ÎµÎ¹Î´Î¹Î¬"
 
@@ -147,8 +147,8 @@ msgstr "Î§Ï?ÎµÎ¹Î¬Î¶Î¿Î¼Î±Î¹ ÎÎ½Î±Î½ ÎµÎ½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÏ? Ï?Ï?Ï?Ï?Î¿ Î³Î¹Î± 
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Î?Î½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÎ¬, Î³Î¹Î± Î½Î± Î¼Î¬Î¸ÎµÏ?Îµ Î³ÎÏ?Ï?Ï?ÎµÏ?, Ï?Ï?ÎµÎ¯Î»Ï?Îµ email Ï?Ï?Î¿ %s. Î£Î·Î¼ÎµÎ¯Ï?Ï?Î·: Î¤Î¿ email Ï?Ï?ÎÏ?ÎµÎ¹ Î½Î± Ï?Ï?Î±Î»ÎµÎ¯ Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹Ï?Î½Ï?Î±Ï? ÎÎ½Î±Î½ Î±Ï?Ï? Ï?Î¿Ï?Ï? Ï?Î±Ï?Î±ÎºÎ¬Ï?Ï? Ï?Î±Ï?Ï?Ï?Î¿Ï?Ï?:\n%s Î® %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -260,19 +260,19 @@ msgstr "Î?Î·Ï?Î®Ï?Ï?Îµ ÎÎ½Î± Pluggable Transport Î²Î¬Ï?ÎµÎ¹ TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Î?Î¬Î²ÎµÏ?Îµ ÎÎ½Î± Î±Î½Ï?Î¯Î³Ï?Î±Ï?Î¿ Ï?Î¿Ï? Î´Î·Î¼Î¿Ï?Î¯Î¿Ï? GnuPG ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï? Ï?Î¿Ï? BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Î?Î½Î±Ï?Î¿Ï?Î¬ Î Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î¿Ï?"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Î Î·Î³Î±Î¯Î¿Ï? Î?Ï?Î´Î¹ÎºÎ±Ï?"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Î?Ï?Ï?ÎµÎ¯Î¿ ÎºÎ±Ï?Î±Î³Ï?Î±Ï?Î®Ï? Î±Î»Î»Î±Î³Ï?Î½"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Î?Ï?Î±Ï?Î®"
 
diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index 5ec2fe8..ce66c87 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# richardshaylor <rshaylor@xxxxxx>, 2014
+# Richard Shaylor <rshaylor@xxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "What are bridges?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "I need an alternative way of getting bridges!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "My bridges don't work! I need help!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "No"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/eo/LC_MESSAGES/bridgedb.po b/eo/LC_MESSAGES/bridgedb.po
index a03e0fe..fba63b7 100644
--- a/eo/LC_MESSAGES/bridgedb.po
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,19 +22,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -58,39 +55,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 6262ed6..74d66d1 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-08 23:10+0000\n"
-"Last-Translator: Paola Falcon <cacoepy@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgstr "Â¡Eh, %s!"
 msgid "Hello, friend!"
 msgstr "Â¡Hola amigo!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Claves pÃºblicas"
 
@@ -146,8 +146,8 @@ msgstr "Â¡Necesito un modo alternativo de conseguir puentes!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Otra forma de obtener bridges es enviar un correo a %s. Por favor observe que debe\nenviar el correo electrÃ³nico usando una direcciÃ³n de uno de los siguientes proveedores\nde correo electrÃ³nico:\n%s o %s"
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -259,19 +259,19 @@ msgstr "Solicitar un Pluggable Transport por TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obtener una copia de la clave pÃºblica GnuPG de BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Reportar una falla"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "CÃ³digo fuente"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Registro de cambios"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contactar"
 
diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index 1b2d1b8..1a35c8c 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -58,39 +55,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Â¿QuÃ© son los puentes de red?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Â¡Necesito una manera alternativa de obtener puentes!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Â¡Mis puentes no funcionan! Necesito ayuda!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/es_CL/LC_MESSAGES/bridgedb.po b/es_CL/LC_MESSAGES/bridgedb.po
index 3c0bd03..c4bf601 100644
--- a/es_CL/LC_MESSAGES/bridgedb.po
+++ b/es_CL/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # halbares <pablo.alvarez.flores@xxxxxxxxx>, 2014
-# Pablo Lezaeta <prflr88@xxxxxxxxx>, 2014
+# Pablo Roberto Francisco Lezaeta Reyes <prflr88@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/torproject/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -58,39 +55,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Â¿CuÃ¡les son los puentes?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Â¡Necesito una forma alternativa de obtener puentes!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Â¡Mi puente no funciona! Â¡AyÃºdenme!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index 28e7c0c..ca0a54b 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/torproject/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po
index 70872ae..0ed9afb 100644
--- a/es_MX/LC_MESSAGES/bridgedb.po
+++ b/es_MX/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po
index 5698270..102f4e4 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ei"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po
index 9c243df..6da4093 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -58,39 +55,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Zer dira zubiak?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Zubiak eskuratzeko modu alternatibo bat behar dut!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ez"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index 3c1c2fc..e4cc82d 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-25 05:10+0000\n"
-"Last-Translator: Mohammad Hossein <desmati@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +79,7 @@ msgstr "Ø³Ù?Ø§Ù?Ø?  %s!"
 msgid "Hello, friend!"
 msgstr "Ø³Ù?Ø§Ù? Ø¯Ù?Ø³Øª Ù?Ù?!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Public Key Ù?Ø§"
 
@@ -147,8 +147,8 @@ msgstr "Ø¨Ù? Û?Ú© Ø±Ø§Ù? Ø¯Û?Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª bridge Ù?Ø§ Ø§ØØªÛ?Ø§Ø¬
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Û?Ú© Ø±Ø§Ù? Ø¯Û?Ú¯Ø± Ø¨Ø±Ø§Û? Ø¯Ø±Û?Ø§Ù?Øª Ù¾Ù? Ù?Ø§ Ø§Ø±Ø³Ø§Ù? Ø§Û?Ù?Û?Ù? Ø¨Ù? Ø¢Ø¯Ø±Ø³ %s Ø§Ø³Øª. ØªÙ?Ø¬Ù? Ú©Ù?Û?Ø¯ Ø§Û?Ù?Û?Ù?Û? Ú©Ù? Ø§Ø±Ø³Ø§Ù? Ù?Û? Ú©Ù?Û?Ø¯Ø? ØØªÙ?Ø§Ù? Ø§Ø² Ø·Ø±Û?Ù? Û?Ú©Û? Ø§Ø² Ø´Ø±Ú©Øª Ù?Ø§Û? Ø²Û?Ø± Ø¨Ø§Ø´Ø¯:\n%s Û?Ø§ %s"
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -260,19 +260,19 @@ msgstr "Ø¯Ø±Ø®Ù?Ø§Ø³Øª Û?Ú© Ø±Ù?Ø´ Transport Ø¬Ø§Û?Ú¯Ø²Û?Ù? Ø¨Ø±Ø§Ø³Ø§Ø³ TYPE"
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ø¯Ø±Û?Ø§Ù?Øª Û?Ú© Ú©Ù¾Û? Ø§Ø² Ú©Ù?Û?Ø¯ Ø¹Ù?Ù?Ù?Û? BridgeDB"
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ú¯Ø²Ø§Ø±Ø´ Û?Ú© Ø¨Ø§Ú¯"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Ú©Ø¯ Ù?Ù?Ø¨Ø¹"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Ù?Û?Ø³Øª ØªØºÛ?Û?Ø±Ø§Øª"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "ØªÙ?Ø§Ø³"
 
diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po
index e859271..ff050b7 100644
--- a/fi/LC_MESSAGES/bridgedb.po
+++ b/fi/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-19 07:40+0000\n"
-"Last-Translator: karvjorm <karvonen.jorma@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Hei ystÃ¤vÃ¤!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Julkiset avaimet"
 
@@ -144,8 +144,8 @@ msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Toinen tapa siltojen hankkimiseen on lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia osoitteeseen %s. Huomaa,\nettÃ¤ sinun on lÃ¤hetettÃ¤vÃ¤ sÃ¤hkÃ¶postiviesti kÃ¤yttÃ¤en yhtÃ¤ seuraavien sÃ¤hkÃ¶postitarjoajien\nosoitetta:\n%s tai %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -257,19 +257,19 @@ msgstr "PyydÃ¤ TYPE-tyyppistÃ¤ irrotettavaa Pluggable Transport-siirtoa."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ilmoita ohjelmointivirheestÃ¤"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "LÃ¤hdekoodi"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Muutosloki"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Yhteystieto"
 
diff --git a/fil/LC_MESSAGES/bridgedb.po b/fil/LC_MESSAGES/bridgedb.po
index cc9b0a7..6633142 100644
--- a/fil/LC_MESSAGES/bridgedb.po
+++ b/fil/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Wala"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/fo/LC_MESSAGES/bridgedb.po b/fo/LC_MESSAGES/bridgedb.po
index 26dcd04..a289188 100644
--- a/fo/LC_MESSAGES/bridgedb.po
+++ b/fo/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Faroese (http://www.transifex.com/projects/p/torproject/language/fo/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 05ff96d..696487f 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-02 02:59+0000\n"
-"Last-Translator: fayÃ§al fatihi <ofaycal.geo.x@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,7 +83,7 @@ msgstr "Salut, %s!"
 msgid "Hello, friend!"
 msgstr "Bonjour, ami !"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Les clÃ©s publiques"
 
@@ -151,8 +151,8 @@ msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Une autre alternative pour obtenir bridges est d'envoyer un email Ã  %s. Veuillez noter que vous devez envoyer un email en utilisant une adresse email d'un des fournisseurs d'accÃ¨s suivant: %s ou %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -264,19 +264,19 @@ msgstr "Demander un Pluggable Transport par TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obtenir une copie de la clef GnuPG publique BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Faire un rapport de Bug"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Le code source"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Changelog"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contact"
 
diff --git a/fr_CA/LC_MESSAGES/bridgedb.po b/fr_CA/LC_MESSAGES/bridgedb.po
index 01a5ee7..6612a42 100644
--- a/fr_CA/LC_MESSAGES/bridgedb.po
+++ b/fr_CA/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-19 17:51+0000\n"
-"Last-Translator: yahoe.001\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr "AllÃ´, %s!"
 msgid "Hello, friend!"
 msgstr "Bonjour l'ami!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Clefs publiques"
 
@@ -144,8 +144,8 @@ msgstr "J'ai besoin d'une alternative pour obtenir des ponts!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Une autre faÃ§on d'obtenir des ponts est d'envoyer un courriel Ã  %s. Veuillez prendre\nnote que vous devez utiliser une adresse d'un des fournisseurs de courriel suivants :\n%s ou %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -257,19 +257,19 @@ msgstr "Demander un transport enfichable par TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obtenir une copie de la clef GnuPG publique de BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapporter un bogue"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Code source"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Journal des changements"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contact"
 
diff --git a/fur/LC_MESSAGES/bridgedb.po b/fur/LC_MESSAGES/bridgedb.po
index fa4d87d..ef58357 100644
--- a/fur/LC_MESSAGES/bridgedb.po
+++ b/fur/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Friulian (http://www.transifex.com/projects/p/torproject/language/fur/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/fy/LC_MESSAGES/bridgedb.po b/fy/LC_MESSAGES/bridgedb.po
index fa490fd..554c090 100644
--- a/fy/LC_MESSAGES/bridgedb.po
+++ b/fy/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Western Frisian (http://www.transifex.com/projects/p/torproject/language/fy/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ga/LC_MESSAGES/bridgedb.po b/ga/LC_MESSAGES/bridgedb.po
index 4cdd4da..6ba84b1 100644
--- a/ga/LC_MESSAGES/bridgedb.po
+++ b/ga/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Irish (http://www.transifex.com/projects/p/torproject/language/ga/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/gl/LC_MESSAGES/bridgedb.po b/gl/LC_MESSAGES/bridgedb.po
index 23ed1c6..8601024 100644
--- a/gl/LC_MESSAGES/bridgedb.po
+++ b/gl/LC_MESSAGES/bridgedb.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # manuel meixide <m.meixide@xxxxxxxxx>, 2013
-# mbouzada <mbouzada@xxxxxxxxx>, 2013
+# Miguel Anxo Bouzada <mbouzada@xxxxxxxxx>, 2013
 # pepepenha <pepepenha@xxxxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-20 17:52+0000\n"
-"Last-Translator: pepepenha <pepepenha@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,19 +23,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "SentÃmolo! Algo foi mal coa sÃºa solicitude."
 
@@ -59,39 +56,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,14 +103,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -117,96 +125,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Que son os repetidores ponte?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Eu necesito un xeito alternativo de obter pontes!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "As miÃ±as pontes non funcionan! Necesito axuda!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -214,52 +230,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -300,28 +325,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Non"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -329,7 +353,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/gu/LC_MESSAGES/bridgedb.po b/gu/LC_MESSAGES/bridgedb.po
index 51e37ab..9f0c183 100644
--- a/gu/LC_MESSAGES/bridgedb.po
+++ b/gu/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Gujarati (http://www.transifex.com/projects/p/torproject/language/gu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/gu_IN/LC_MESSAGES/bridgedb.po b/gu_IN/LC_MESSAGES/bridgedb.po
index c8d8300..6afb06f 100644
--- a/gu_IN/LC_MESSAGES/bridgedb.po
+++ b/gu_IN/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Gujarati (India) (http://www.transifex.com/projects/p/torproject/language/gu_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/gun/LC_MESSAGES/bridgedb.po b/gun/LC_MESSAGES/bridgedb.po
index 58e743b..6ee08ea 100644
--- a/gun/LC_MESSAGES/bridgedb.po
+++ b/gun/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Gun (http://www.transifex.com/projects/p/torproject/language/gun/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ha/LC_MESSAGES/bridgedb.po b/ha/LC_MESSAGES/bridgedb.po
index 83d7b2f..b05f3ce 100644
--- a/ha/LC_MESSAGES/bridgedb.po
+++ b/ha/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Hausa (http://www.transifex.com/projects/p/torproject/language/ha/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po
index af179c7..5603c63 100644
--- a/he/LC_MESSAGES/bridgedb.po
+++ b/he/LC_MESSAGES/bridgedb.po
@@ -7,13 +7,13 @@
 # Elifelet <arab.with.nargila@xxxxxxxxx>, 2014
 # GenghisKhan <genghiskhan@xxxxxx>, 2013
 # Kunda, 2014
-# Cuvint Chofschy <static.172@xxxxxxxxx>, 2012
+# static172 <static.172@xxxxxxxxx>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -25,19 +25,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -61,39 +58,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,14 +105,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -119,96 +127,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "×?×?×? ×?×©×¨×?×??"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "×?× ×? ×?×§×?×§ ×?×?×¨×? ×?×?×?×¤×?×ª ×?×§×?×?×ª ×?×©×¨×?×?!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "×?×?×©×¨×?×? ×©×?×? ×?×? ×¢×?×?×?×?×?! ×?× ×? ×?×§×?×§ ×?×¢×?×¨×?!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -216,52 +232,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "×?×?×?×? ×¢×? ×ª×§×?×?"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -302,28 +327,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "×?×?"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -331,7 +355,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po
index 6cc95d6..bad5b3d 100644
--- a/hi/LC_MESSAGES/bridgedb.po
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-15 05:10+0000\n"
-"Last-Translator: b1nKG <bineetkumar@xxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr "à¤?à¤°à¥?, %s!"
 msgid "Hello, friend!"
 msgstr "à¤¨à¤®à¤¸à¥?à¤¤à¥?, à¤¦à¥?à¤¸à¥?à¤¤!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "à¤¸à¤¾à¤°à¥?à¤µà¤?à¤¨à¤¿à¤? à¤?à¥?à¤?à¤?à¥?"
 
@@ -141,7 +141,7 @@ msgstr ""
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -254,19 +254,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
diff --git a/hr/LC_MESSAGES/bridgedb.po b/hr/LC_MESSAGES/bridgedb.po
index b864b4d..61ba18c 100644
--- a/hr/LC_MESSAGES/bridgedb.po
+++ b/hr/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# anchorsound <anchorsound@xxxxxxxxx>, 2014
+# Nikola Parsifal <anchorsound@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ne"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po
index af52bb1..7eb3224 100644
--- a/hr_HR/LC_MESSAGES/bridgedb.po
+++ b/hr_HR/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-30 13:01+0000\n"
-"Last-Translator: Ana B\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr "Bok, %s!"
 msgid "Hello, friend!"
 msgstr "Bok, prijatelju!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Javni kljuÄ?evi"
 
@@ -143,8 +143,8 @@ msgstr "Trebam alternativni naÄ?in dobivanja mostova!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "JoÅ¡ jedan naÄ?in za dobiti mostove je da poÅ¡aljete email na %s. Imajte na umu da morate\nposlati email koristeÄ?i adresu jednog od sljedeÄ?ih email providera:\n%s ili %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -256,19 +256,19 @@ msgstr "ZatraÅ¾i Pluggable Transport od TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Dobij kopiju BridgeDB javnog GnuPG kljuÄ?a."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Prijavi GreÅ¡ki"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Izvorni Kod"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Changelog"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontakt"
 
diff --git a/ht/LC_MESSAGES/bridgedb.po b/ht/LC_MESSAGES/bridgedb.po
index 884397c..15c5df1 100644
--- a/ht/LC_MESSAGES/bridgedb.po
+++ b/ht/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Haitian (Haitian Creole) (http://www.transifex.com/projects/p/torproject/language/ht/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po
index d11c31b..6e7dbfe 100644
--- a/hu/LC_MESSAGES/bridgedb.po
+++ b/hu/LC_MESSAGES/bridgedb.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Blackywantscookies <gaborcika111@xxxxxxxxx>, 2014
+# Blackywantscookies <gaborcika@xxxxxxxxxxxx>, 2014
 # Cerbo <taiurin@xxxxxxxxx>, 2014
 # vargaviktor <viktor.varga@xxxxxxxxx>, 2013
 # vargaviktor <viktor.varga@xxxxxxxxx>, 2011
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-24 14:51+0000\n"
-"Last-Translator: Blackywantscookies <gaborcika111@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr "HÃ©, %s!"
 msgid "Hello, friend!"
 msgstr "Hello!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "NyilvÃ¡nos kulcsok"
 
@@ -144,8 +144,8 @@ msgstr "SzÃ¼ksÃ©gem van egy alternatÃv mÃ³dra a Hidak beszerzÃ©sÃ©hez!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "MÃ¡sik mÃ³dszer hidak beszerzÃ©sÃ©re email kÃ¼ldÃ©sÃ©vel lehetsÃ©ges a %s cÃmre. \nKÃ©rem vegye figyelembe azt hogy az email kÃ¼ldÃ©sÃ©hez hasznÃ¡ljon egyet az alÃ¡bbi email szolgÃ¡ltatÃ³k kÃ¶zÃ¼l. \n%s vagy %s"
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -257,19 +257,19 @@ msgstr "Egy csatlakoztathatÃ³ szÃ¡llÃtÃ³ kÃ©relme TYPE szerint."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "MÃ¡solat szertÃ©se a BridgeDB's publikus GnuPG kulcsÃ¡bÃ³l."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Hiba jelentÃ©se"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "ForrÃ¡s kÃ³d"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "VÃ¡ltozÃ¡sok"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kapcsolat"
 
diff --git a/hy/LC_MESSAGES/bridgedb.po b/hy/LC_MESSAGES/bridgedb.po
index 09b4ada..c1e99d3 100644
--- a/hy/LC_MESSAGES/bridgedb.po
+++ b/hy/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po
index 5f2cc34..38def8f 100644
--- a/hy_AM/LC_MESSAGES/bridgedb.po
+++ b/hy_AM/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/torproject/language/hy_AM/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ia/LC_MESSAGES/bridgedb.po b/ia/LC_MESSAGES/bridgedb.po
index 8662940..a7edcf4 100644
--- a/ia/LC_MESSAGES/bridgedb.po
+++ b/ia/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/torproject/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "No"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po
index 1a0a909..1841863 100644
--- a/id/LC_MESSAGES/bridgedb.po
+++ b/id/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-26 12:41+0000\n"
-"Last-Translator: L1Nus <multazam_ali@xxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
@@ -143,7 +143,7 @@ msgstr "Adakah cara lain untuk memperoleh penghubung?"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -256,19 +256,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index 08555d2..5390c2a 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,7 +72,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -253,19 +253,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po
index ba7d480..c1da40b 100644
--- a/it/LC_MESSAGES/bridgedb.po
+++ b/it/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-20 15:51+0000\n"
-"Last-Translator: Paolo Stivanin <paolostivanin@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,19 +31,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "Siamo spiacenti ma qualcosa Ã¨ andato storto con la tua richiesta."
 
@@ -67,39 +64,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)"
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "Benvenuto/a su BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr "Transport TYPEs attualmente supportati:"
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hey, %s!"
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr "Ciao amico!"
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Chiavi Pubbliche"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr "Questa email Ã¨ stata generata con arcobaleni, unicorni e scintille\nper %s il %s alle %s."
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,14 +111,20 @@ msgid ""
 "\n"
 msgstr "BridgeDB puÃ² fornire dei bridge con numerosi %stipi di Pluggable Transports%s,\ni quali possono aiutare ad offuscare la tua connessione alla Rete Tor, rendendo\npiÃ¹ difficile a chiunque vedere il tuo traffico internet per determinare che stai\nusando Tor.\n\n"
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni Pluggable\nTransports non siano compatibili con IPv6.\n\n"
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,96 +133,104 @@ msgid ""
 "\n"
 msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n"
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Cosa sono i bridge?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridge %s sono relay di Tor che ti aiutano ad aggirare la censura."
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Mi serve un altro modo per avere dei bridge!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Un altro modo per ottenere dei bridge Ã¨ inviare un'email a %s. Nota che devi\ninviare l'email usando un indirizzo tra uno dei seguenti provider di email:\n%s o %s."
+"%s, %s or %s."
+msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "I miei bridge non funzionano! Mi serve aiuto!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Se Tor non ti funziona, manda un'email a %s."
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Cerca di includere piÃ¹ informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc."
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr "Ecco le tue linee bridge:"
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr "Ottieni dei Bridge!"
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "Seleziona le opzioni per il tipo di bridge:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "Ti servono indirizzi IPv6?"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ti serve un %s?"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "Il tuo browser non mostra le immagini in modo corretto."
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr "Inserisci i caratteri nell'immagine sopra..."
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr "Come iniziare a usare i tuoi bridge"
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr "Per inserire i bridge nel Tor Browser, segui le istruzioni nella %s pagina\ndi download di Tor Browser %s per avviare Tor Browser."
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Quando appare la finestra delle 'Impostazioni Rete Tor', clicca 'Configura' e\nsegui la procedura giudata finchÃ¨ non chiede:"
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?"
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -222,52 +238,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Seleziona 'SÃ¬' e poi clicca 'Avanti'. Per configurare i nuovi bridge, copia e\nincolla le linee bridge nella casella di testo. Infine, clicca 'Connetti' e dovrebbe\nessere tutto pronto! Se avrai problemi, prova a cliccare il pulsante 'Aiuto'\nnella procedura guidata 'Impostazioni Rete Tor' per avere assistenza."
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "Mostra questo messaggio."
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "Richiedi bridge vanilla."
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "Richiedi bridge IPv6."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Richiedi un Pluggable Transport by TYPE."
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Segnala un Errore"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Codice Sorgente"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Changelog"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contatti"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, spaghettios!"
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "Non ci sono bridge disponibili al momento..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -308,28 +333,27 @@ msgstr "Ora %s aggiungi i bridge a Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sD%sammi i bridge e basta!"
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "Opzioni Avanzate"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "No"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "nessuno"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sS%sÃ¬!"
@@ -337,7 +361,7 @@ msgstr "%sS%sÃ¬!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sO%sttieni Bridge"
diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po
index 76232ac..4750704 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/LC_MESSAGES/bridgedb.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 # brt <87@xxxxxxxxxxx>, 2013
-# plazmism <gomidori@xxxxxxx>, 2013
-# plazmism <gomidori@xxxxxxx>, 2014
+# ã?¿ã?«ã??ã?· <gomidori@xxxxxxx>, 2013
+# ã?¿ã?«ã??ã?· <gomidori@xxxxxxx>, 2014
 # Masaki Saito <rezoolab@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-03 15:41+0000\n"
-"Last-Translator: plazmism <gomidori@xxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,19 +24,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "ç?³ã??è¨³ã??ã??ã?¾ã??ã??ã??ã??ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??"
 
@@ -60,39 +57,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "ã?³ã??ã?³ã??: (ã?³ã??ã?³ã??ã??çµ?ã?¿å??ã??ã??ã?¦ã??å??æ??ã?«è¤?æ?°ã?®ã?ªã??ã?·ã?§ã?³ã??æ??å®?ã??ã??)"
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "BridgeDB ã?¸ã??ã??ã??ã??ï¼?"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr "ç?¾å?¨ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã??ã??ã?©ã?³ã?¹ã??ã?¼ã??ã?¿ã?¤ã??:"
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr "ã?©ã??ã?? %s ã??ã??ï¼?"
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr "ã?©ã??ã??ã??ã??ã?«ã?¡ã?¯ï¼?"
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "å?¬é??é?µ"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr "ã??ã?®ã?¡ã?¼ã?«ã?¯ %s ã?« %s %s ã?« rainbow å??ã?³ unicorn ã?? sparkle ã?§ç??æ??ã??ã??ã?¾ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,14 +104,20 @@ msgid ""
 "\n"
 msgstr "BridgeDB ã?¯ã??%sã?¿ã?¤ã??ã?® Pluggable Transports%s ã?§ã??ã?ªã??ã?¸ã??æ??ä¾?ã??ã?¾ã??ã??\nTor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??æ??ã??ã??ã?¥ã??ã??ã??ã??ã??ã?¨ã?«å½¹ç«?ã?¡ã??ã??ã?ªã??ã?®\nã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã?©ã??ã?£ã??ã?¯ã??ç?£è¦?ã??ã?¦ã??ã??èª°ã??ã??ã??ã?ªã??ã?? Tor ã??ä½¿ç?¨ã??ã?¦ã??ã??ã??ã?¨ã??å?¤å?¥ã??ã??ã??ã?¨ã??ã??ã??ã?«é?£ã??ã??ã?ªã??ã?¾ã??ã??\n\n"
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr "IPv6 ã?®ã?¢ã??ã?¬ã?¹ã?®ã??ã?ªã??ã?¸ã??å?©ç?¨ã?§ã??ã??ã??ã?®ã??ã??ã??ã?¾ã??ã??ã?? Pluggable Transports ã?«ã?¯ IPv6 ã?«äº?æ??æ?§ã??ã?ªã??ã??ã?®ã??ã??ã??ã?¾ã??ã??\n\n"
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -118,96 +126,104 @@ msgid ""
 "\n"
 msgstr "å? ã??ã?¦ã??  BridgeDB ã?¯ã?? %s Pluggable Transport %s ã?®ã?ªã??å¤?ã??ã?®ä½?ã?®å¤?å?²ã??ã?ªã??\né??å¸¸ã?®ã??ã?ªã??ã?¸ã??æ??ã?¡ã??ã??ã??ã?¯ã?¯ã?¼ã?«ã?«ã?¯æ??ã??ã?ªã??ã??ã??ã??ã??ã?¾ã??ã??ã??ã??ã??ã??ã??å¤?ã??ã?®å ´å??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??ã?®ã?«ã?ªã??æ??å?¹ã?§ã??ã??\n"
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "ã??ã?ªã??ã?¸ã?¨ã?¯ï¼?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s ã??ã?ªã??ã?¸ %s ã?¯ã?? ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??å?©ã??ã?¨ã?ªã?? Tor ã?ªã?¬ã?¼ã?§ã??ã??"
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "ã??ã?ªã??ã?¸ã??å¾?ã??ä»?ã?®æ?¹æ³?ã??å¿?è¦?ã?§ã??!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??å?¥ã?®ã??ã??æ?¹ã?¯ %s ã?¾ã?§ã?¡ã?¼ã?«ã??é??ã??ã??ã?¨ã?§ã??ã??ä»¥ä¸?ã?®ã?¡ã?¼ã?«ã??ã?ã??ã?¤ã??ã?®ã??ã?¡ã?®1ã?¤ã?®ã?¢ã??ã?¬ã?¹ã??ä½¿ç?¨ã??ã?¦ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?ªã??ã??ã?°ã?ªã??ã?ªã??ã??ã?¨ã?«ã??æ³¨æ??ã??ã? ã??ã??: %s ã?¾ã??ã?¯ %s"
+"%s, %s or %s."
+msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "ç§?ã?®ã??ã?ªã??ã?¸ã??å??ã??ã?¾ã??ã??! å?©ã??ã?¦ã??ã? ã??ã??!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Tor ã??ã??ã?¾ã??å??ä½?ã??ã?ªã??å ´å??ã?? %s ã?¾ã?§ã?¡ã?¼ã?«ã??ä¸?ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "ã??ã?ªã??ã??ä½¿ã??ã??ã?¨ã??ã??ã??ã?ªã??ã?¸ã?? Pluggable Transports ã?? ã??å?©ç?¨ã?® Tor Browser ã??ã?¼ã?¸ã?§ã?³ã??ã??ã??ã?¦ Tor ã??å?ºå??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ç?ã?ªã?©ã??å?«ã?¿ã??å?ºæ?¥ã??é??ã??ã??ã?ªã??ã?®ã?±ã?¼ã?¹ã?«é?¢ã??ã??å¤?ã??ã?®æ??å ±ã??å?«ã??ã?¦ã?¿ã?¦ã??ã? ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?¯ã??ã?¡ã??ã?§ã??:"
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ï¼?"
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã?®ã?ªã??ã?·ã?§ã?³ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ã?¢ã??ã?¬ã?¹ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ã??å¿?è¦?ã?§ã??ã??ï¼?"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "ã??å?©ç?¨ã?®ã??ã?©ã?¦ã?¶ã?¯é?©å??ã?«ç?»å??ã??è¡¨ç¤ºã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr "ä¸?è¨?ã?®ç?»å??ã??ã??æ??å?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??..."
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr "ã??ã?ªã??ã?¸ä½¿ç?¨ã?®å§?ã??æ?¹"
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr "Tor Browser ã?«ã??ã?ªã??ã?¸æ??å ±ã??å?¥å??ã??ã??ã?«ã?¯ã?? %s Tor Browser ã?®ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¼ã?¸ %s ã?®æ??ç¤ºã?«å¾?ã?£ã?¦ Tor Browser ã??èµ·å??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "ã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã??ã?¤ã?¢ã?ã?°ã??ã??ã??ã??ã?¢ã??ã??ã??ã??é??ã??è¨å®?ã??ã?¯ã?ªã??ã?¯ã??ã?¦\nè??ã??ã??ã??ã?¾ã?§ã?¦ã?£ã?¶ã?¼ã??ã?«å¾?ã?£ã?¦ã??ã? ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "ã??å?©ç?¨ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?µã?¼ã??ã?¹ã??ã?ã??ã?¤ã??ã?¼ (ISP) ã?¯ Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã?ªã??ã??\nå?¥ã?®ã??ã??æ?¹ã?§æ¤?é?²ã??ã?¦ã??ã?¾ã??ã??ï¼?"
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -215,52 +231,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "ã??ã?¯ã??ã??ã??é?¸æ??ã??ã?¦ã??ã??æ¬¡ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??æ?°ã??ã??ã??ã?ªã??ã?¸ã??æ§?æ??ã??ã??ã??ã??ã?«ã??ã??ã?ã?¹ã??\nå?¥å??ã??ã??ã?¯ã?¹ã?«ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã??ã?¼ã?¹ã??ã??ã?¦ã??ã? ã??ã??ã??æ??å¾?ã?«ã??ã??æ?¥ç¶?ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??\nã??ã??æº?å??ã??å?ºæ?¥ã??ã?¯ã??ã?§ã??ï¼?ä½?ã??å??é¡?ã??ã??ã?£ã??ã??ã??ã??ã??ã?ªã??å?©ã??ã??å¾?ã??ã??ã??ã?«ã??Tor\nã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¦ã?£ã?¶ã?¼ã??å??ã??ã??ã?«ã??ã??ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "ã??ã?®ç?»å??ã??è¡¨ç¤º"
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "vanilla ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "ã?¿ã?¤ã??ã??ã?¨ã?« Pluggable Transport ã??ã?ªã?¯ã?¨ã?¹ã??"
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB ã?® GnuPG å?¬é??é?µã?®ã?³ã??ã?¼ã??æ??ã?«å?¥ã??ã?¾ã??ã??ã??ã??"
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "ã??ã?°ã??å ±å??ã??ã??"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "ã?½ã?¼ã?¹ã?³ã?¼ã??"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "å¤?æ?´å±¥æ´"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "ã??å??ã??å??ã??ã??"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr "ã??ã?£ã?¨ã?¹ã??ã?²ã??ã??ã?£ï¼?"
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "ä»?ã?®æ??ç?¹ã?§ã?¯å?©ç?¨ã?§ã??ã??ã??ã?ªã??ã?¸ã??ã??ã??ã?¾ã??ã??..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -301,28 +326,27 @@ msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??è¿½å? ã??ã?¾ã?? %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sã??%sã?®ã??ã??ã? ã??ã??ã?? bridges!"
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "é«?åº¦ã?ªè¨å®?"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "ã??ã??ã??"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "ã?ªã??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sã?¯%sã??ï¼?"
@@ -330,7 +354,7 @@ msgstr "%sã?¯%sã??ï¼?"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Bridges"
diff --git a/jv/LC_MESSAGES/bridgedb.po b/jv/LC_MESSAGES/bridgedb.po
index 6e43864..1a69b22 100644
--- a/jv/LC_MESSAGES/bridgedb.po
+++ b/jv/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Javanese (http://www.transifex.com/projects/p/torproject/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po
index 048e06a..d74c57f 100644
--- a/ka/LC_MESSAGES/bridgedb.po
+++ b/ka/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# x0rmia <x0rmia@xxxxxxxxx>, 2013
+# George Rommel <x0rmia@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/kk/LC_MESSAGES/bridgedb.po b/kk/LC_MESSAGES/bridgedb.po
index 3183909..96437cc 100644
--- a/kk/LC_MESSAGES/bridgedb.po
+++ b/kk/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Kazakh (http://www.transifex.com/projects/p/torproject/language/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Ð?Ó©Ñ?Ñ?Ð¿Ð»ÐµÑ? Ð´ÐµÐ³ÐµÐ½Ñ?Ð¼Ñ?Ð· Ð½Ðµ?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ó©Ð¿Ñ?Ñ?Ð»ÐµÑ? Ð°Ð»Ñ?Ð´Ñ?Ò£ Ð¼Ð°Ò?Ð°Ð½ Ð±Ð°Ñ?Ò?Ð° Ð¶Ð¾Ð»Ñ? ÐºÐµÑ?ÐµÐº!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?ÐµÐ½Ñ?Ò£ ÐºÓ©Ð¿Ñ?Ñ?Ð»ÐµÑ?Ñ?Ð¼ Ð¶Ò±Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?ÐµÐ¼ÐµÐ¹Ð´Ñ?! Ð?Ó©Ð¼ÐµÐº Ò?Ð°Ð¶ÐµÑ?!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po
index 95a26bc..051c250 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-10 02:50+0000\n"
-"Last-Translator: Sokhem Khoem <sokhem@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr "á? á??, %s!"
 msgid "Hello, friend!"
 msgstr "á??á?½á??á??á??á?¸, á??á?·á??á??á??á??á??á??á??á??á?·!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "á??á??â??á??á?¶á??á?¶á??á??á??"
 
@@ -144,8 +144,8 @@ msgstr "á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á?·á??á?¸á??á?¶á??á??á??
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -257,19 +257,19 @@ msgstr "á??á??á??á?¾â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??â??á?¢á?¶á??â??á??
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Get a copy of BridgeDB's public GnuPG key."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "á??á??á?¶á??á??á?¶á??á??á??â??á??á??á? á?»á??"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "á??á?¼á??â??á??á??á??á??á??"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Changelog"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "á??á??á??á?¶á??á??á??á??á??á??"
 
diff --git a/kn/LC_MESSAGES/bridgedb.po b/kn/LC_MESSAGES/bridgedb.po
index ec8c3d1..30ff5c6 100644
--- a/kn/LC_MESSAGES/bridgedb.po
+++ b/kn/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # msj2, 2013
-# msj2, 2013
+# MSJ, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -58,39 +55,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "à²¬à³?à²°à²¿à²¡à³?à²?à³? à²?à²³à³? à²?à²?à²¦à²°à³? à²?à²¨à³??"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "à²¨à²¨à²?à³? à²¬à³?à²°à²¿à²¡à³?à²?à³?â??à²?à²³à³? à²¸à²¿à²?à³?à²µ à²¬à²¦à²²à²¿ à²®à²¾à²°à³?à²? à²¬à³?à²?à³?"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "à²¨à²¨à³?à²¨ à²¬à³?à²°à²¿à²¡à³?à²?à³?â??à²?à²³à³? à²?à³?à²²à²¸ à²®à²¾à²¡à³?à²¤à²¿à²²à³?à²². à²¸à²¹à²¾à²¯ à²®à²¾à²¡à²¿"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "à²?à²²à³?à²²"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index 493c851..b771f0a 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-24 07:11+0000\n"
-"Last-Translator: ilbe123 <a3057016@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,19 +25,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "ì£?ì?¡í?©ë??ë?¤! ë?¹ì? ì?? ì??ì²ì?? ë¬´ì?¸ê°? ë¬¸ì ?ê°? ì??ì?µë??ë?¤."
 
@@ -61,39 +58,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "BridgeDB ì?? ì?¤ì?  ê²?ì?? í??ì??í?©ë??ë?¤!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "ê³µê°? í?¤"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,14 +105,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -119,96 +127,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "'ë¸?ë¦¿ì§?'ë???"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ë?? ë?¤ë¥¸ ë°©ë²?ì?´ ì??ì??ê¹?ì???"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "ë¸?ë¦¿ì§?ê°? ë§?ì?´ ê°?ì?´ì??! ë??ì??ì¤?ì??!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?»ì?¼ì?¸ì??!"
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "ë¸?ë¦¿ì§? ì¢?ë¥?ì?? ê´?í?? ì?µì??ì?? ê³¨ë?¼ ì£¼ì?¸ì??:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "IPv6 ì£¼ì??ê°? í??ì??í?©ë??ê¹??"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "%s ê°? í??ì??í?©ë??ê¹??"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "ë?¹ì? ì?? ë¸?ë?¼ì?°ì ?ë?? ì?¬ì§?ì?? ì ?ì??ì ?ì?¼ë¡? ë¶?ë?¬ì?¤ì§? ëª»í?©ë??ë?¤."
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr "ë¸?ë¦¿ì§?ë¥¼ ì?¬ì?©í??ë?? ë°©ë²?"
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -216,52 +232,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "ì?´ ë©?ì?¸ì§?ë¥¼ í??ì??í??ê¸°"
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "ë°?ë??ë?¼ ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ë¸?ë¦¿ì§?ë¥¼ ì??ì²í?©ë??ë?¤."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDBì?? ê³µê°? GnuPG í?¤ë¥¼ ì?»ì?µë??ë?¤."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "ë²?ê·¸ ì? ê³ í??ê¸°"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "ì??ì?¤ ì½?ë??"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "ë³?ê²½ ê¸°ë¡?"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "ì?°ë?½í??ê¸°"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "í??ì?¬ ì?¬ì?©í?  ì?? ì??ë?? ë¸?ë¦¿ì§?ê°? ì??ì?µë??ë?¤..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -302,28 +327,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "ê³ ê¸? ì?µì??"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "ì??ë??ì?¤"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "ì??ì??"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -331,7 +355,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ko_KR/LC_MESSAGES/bridgedb.po b/ko_KR/LC_MESSAGES/bridgedb.po
index 405b6f8..6135621 100644
--- a/ko_KR/LC_MESSAGES/bridgedb.po
+++ b/ko_KR/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/torproject/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ku/LC_MESSAGES/bridgedb.po b/ku/LC_MESSAGES/bridgedb.po
index 4124f47..92fbc9a 100644
--- a/ku/LC_MESSAGES/bridgedb.po
+++ b/ku/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Kurdish (http://www.transifex.com/projects/p/torproject/language/ku/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/kw/LC_MESSAGES/bridgedb.po b/kw/LC_MESSAGES/bridgedb.po
index 421a1c4..81ff58b 100644
--- a/kw/LC_MESSAGES/bridgedb.po
+++ b/kw/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Cornish (http://www.transifex.com/projects/p/torproject/language/kw/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ky/LC_MESSAGES/bridgedb.po b/ky/LC_MESSAGES/bridgedb.po
index 4b83258..d473389 100644
--- a/ky/LC_MESSAGES/bridgedb.po
+++ b/ky/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Kirgyz (http://www.transifex.com/projects/p/torproject/language/ky/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/lb/LC_MESSAGES/bridgedb.po b/lb/LC_MESSAGES/bridgedb.po
index 5472fc9..fa1008e 100644
--- a/lb/LC_MESSAGES/bridgedb.po
+++ b/lb/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/torproject/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/lg/LC_MESSAGES/bridgedb.po b/lg/LC_MESSAGES/bridgedb.po
index de12cc1..da64a7e 100644
--- a/lg/LC_MESSAGES/bridgedb.po
+++ b/lg/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Ganda (http://www.transifex.com/projects/p/torproject/language/lg/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ln/LC_MESSAGES/bridgedb.po b/ln/LC_MESSAGES/bridgedb.po
index c24bf46..939e776 100644
--- a/ln/LC_MESSAGES/bridgedb.po
+++ b/ln/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Lingala (http://www.transifex.com/projects/p/torproject/language/ln/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/lo/LC_MESSAGES/bridgedb.po b/lo/LC_MESSAGES/bridgedb.po
index 1284717..3f1686a 100644
--- a/lo/LC_MESSAGES/bridgedb.po
+++ b/lo/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Lao (http://www.transifex.com/projects/p/torproject/language/lo/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po
index 796214e..0302035 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-23 12:20+0000\n"
-"Last-Translator: Edgaras7 <system@xxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +74,7 @@ msgstr "Labas, %s!"
 msgid "Hello, friend!"
 msgstr "Sveiki!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "VieÅ¡ieji Raktai"
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -255,19 +255,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "PraneÅ¡kite klaidÄ?"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Å altinio Kodas"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontaktai"
 
diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po
index 8650ef5..ac01ff5 100644
--- a/lv/LC_MESSAGES/bridgedb.po
+++ b/lv/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-16 17:01+0000\n"
-"Last-Translator: OjÄ?rs Balcers <ojars.balcers@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +74,7 @@ msgstr "Hei, %s!"
 msgid "Hello, friend!"
 msgstr "Sveiks, draug!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "PubliskÄ?s atslÄ?gas"
 
@@ -142,8 +142,8 @@ msgstr "Man nepiecieÅ¡ams alternatÄ«vs tiltu iegÅ«Å¡anas veids!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "VÄ?l cits veids kÄ? saÅ?emt tiltu sarakstus ir nosÅ«tÄ«t e-pastu uz %s. LÅ«dzu, ievÄ?rojiet, ka e-pasts jÄ?nosÅ«ta no norÄ?dÄ«to e-pasta pakalpojumu sniedzÄ?ju nodroÅ¡inÄ?tas adreses:\n%s vai %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -255,19 +255,19 @@ msgstr "PieprasÄ«t Pluggable Transport pÄ?c TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "SaÅ?emt BridgeDB publiskÄ?s GnuPG atslÄ?gas kopiju."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "ZiÅ?ot par kÄ¼Å«du"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Pirmkods"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "IzmaiÅ?u Å¾urnÄ?ls"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "SazinÄ?ties"
 
diff --git a/mg/LC_MESSAGES/bridgedb.po b/mg/LC_MESSAGES/bridgedb.po
index d51e994..e5edf64 100644
--- a/mg/LC_MESSAGES/bridgedb.po
+++ b/mg/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Malagasy (http://www.transifex.com/projects/p/torproject/language/mg/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/mi/LC_MESSAGES/bridgedb.po b/mi/LC_MESSAGES/bridgedb.po
index bda7f81..08beb3a 100644
--- a/mi/LC_MESSAGES/bridgedb.po
+++ b/mi/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Maori (http://www.transifex.com/projects/p/torproject/language/mi/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po
index ea612d9..c34d159 100644
--- a/mk/LC_MESSAGES/bridgedb.po
+++ b/mk/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# VHR <viktor.hr@xxxxxxxxx>, 2014
+# Viktor Hristov <viktor.hr@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Ð¨Ñ?Ð¾ Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð°?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð°Ð»Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²ÐµÐ½ Ð½Ð°Ñ?Ð¸Ð½ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ð°Ð¼ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð°!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð° Ð½Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¾Ð½Ð¸Ñ?Ð°Ð°Ñ?! Ð?Ð¸ Ñ?Ñ?ÐµÐ±Ð° Ð¿Ð¾Ð¼Ð¾Ñ?!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po
index e2b0dfa..90e5dc1 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/mn/LC_MESSAGES/bridgedb.po b/mn/LC_MESSAGES/bridgedb.po
index 2ef6923..3b21886 100644
--- a/mn/LC_MESSAGES/bridgedb.po
+++ b/mn/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/torproject/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po
index 5016bc0..097d91e 100644
--- a/mr/LC_MESSAGES/bridgedb.po
+++ b/mr/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/torproject/language/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ms_MY/LC_MESSAGES/bridgedb.po b/ms_MY/LC_MESSAGES/bridgedb.po
index cf32797..29045ce 100644
--- a/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/ms_MY/LC_MESSAGES/bridgedb.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# shahril <mohd_shahril_96@xxxxxxxxx>, 2013
+# Mohd Shahril Bin Zainol Abidin <mohd_shahril_96@xxxxxxxxx>, 2013
 # Weldan Jamili <mweldan@xxxxxxxxx>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -58,39 +55,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Apakah itu bridges ?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Saya perlukan cara alternatif untuk mendapatkan bridges!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Bridges saya tidak berfungsi! Saya perlukan bantuan!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Tidak"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/mt/LC_MESSAGES/bridgedb.po b/mt/LC_MESSAGES/bridgedb.po
index ae954f4..f04c2df 100644
--- a/mt/LC_MESSAGES/bridgedb.po
+++ b/mt/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Maltese (http://www.transifex.com/projects/p/torproject/language/mt/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/my/LC_MESSAGES/bridgedb.po b/my/LC_MESSAGES/bridgedb.po
index 9e3b12c..76f6b57 100644
--- a/my/LC_MESSAGES/bridgedb.po
+++ b/my/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Burmese (http://www.transifex.com/projects/p/torproject/language/my/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "á??á??á?ºá??á??á?¶á?·á?«"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/nah/LC_MESSAGES/bridgedb.po b/nah/LC_MESSAGES/bridgedb.po
index a4315a3..2389ec5 100644
--- a/nah/LC_MESSAGES/bridgedb.po
+++ b/nah/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Nahuatl (http://www.transifex.com/projects/p/torproject/language/nah/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/nap/LC_MESSAGES/bridgedb.po b/nap/LC_MESSAGES/bridgedb.po
index b0e34cb..da0f781 100644
--- a/nap/LC_MESSAGES/bridgedb.po
+++ b/nap/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Neapolitan (http://www.transifex.com/projects/p/torproject/language/nap/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index b631bb7..d647f6d 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-06 21:30+0000\n"
-"Last-Translator: Allan NordhÃ¸y <comradekingu@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,19 +24,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "Dette var leit! Noe gikk galt med forespÃ¸rselen din."
 
@@ -60,39 +57,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "KOMMANDOer: (kombiner KOMMANDer to Ã¥ angi flere valg samtidig)"
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "Velkommen til BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr "NÃ¥vÃ¦rende stÃ¸ttede transport TYPEr:"
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hei, %s!"
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr "Hallo, lille venn!"
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸kler"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr "Denne e-posten ble laget med regnbuer, enhjÃ¸rninger og stjerneskudd for %s pÃ¥ %s klokken %s."
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,14 +104,20 @@ msgid ""
 "\n"
 msgstr "I BridgeDB finnes broer med flere %styper av pluggbare transporter%s,\nsom kan hjelpe deg med Ã¥ tilslÃ¸re dine tilkoblinger til Tor-nettverket, noe som gjÃ¸r det\nvanskelig for noen som overvÃ¥ker din internett-trafikk Ã¥ fastsette hvorvidt du\nbruker Tor eller ei\n\n"
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr "Noen broer med IPv6-adresser er ogsÃ¥ tilgjelgelige, dog er noen pluggbare\nTransporter ikke IPv6-kompatible.\n\n"
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -118,96 +126,104 @@ msgid ""
 "\n"
 msgstr "Merk ogsÃ¥, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke hÃ¸res sÃ¥ tÃ¸ft ut, men de kan fremdeles\nbehjelpe omgÃ¥else av internettsensur i de fleste fall.\n\n"
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Hva er broer?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Broer %s er Tor-tilknyttninger som hjelper deg med Ã¥ omgÃ¥ sensur."
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Jeg trenger en alternativ mÃ¥te Ã¥ fÃ¥ broer pÃ¥!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "En annen mÃ¥te Ã¥ tilknytte seg broer pÃ¥ er Ã¥ sende en epost til %s. Merk at du mÃ¥\nsende eposten fra en adresse tilhÃ¸rende en av fÃ¸lgende epost-tilbydere:\n%s eller %s."
+"%s, %s or %s."
+msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Hvis din Tor ikke virker, burde du skrive epost til %s."
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "PrÃ¸v Ã¥ fÃ¥ med sÃ¥ mye info om dit tilfelle du kan, inkludert en liste over\nbroene og pluggbare transporter du prÃ¸vde Ã¥ bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor mÃ¥tte produsere, osv."
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro-linjer:"
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr "FÃ¥ broer!"
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "GjÃ¸r valg for brotype:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "Trenger du IPv6-adresser?"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trenger du en %s?"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "Nettleseren din viser ikke bilder ordentlig."
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr "Skriv inn bokstavene fra bildet ovenfor..."
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr "Hvordan starte med bruk av dine broer"
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr "For Ã¥ oppfÃ¸re broer i Tor-nettleseren, fÃ¸lg instruksjonene pÃ¥ %s Tor\nnettleser nedlastingsside %s for Ã¥ starte Tor-nettleser."
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "NÃ¥r 'Tor nettverks-innstillinger' dialogboksen spretter opp, trykk pÃ¥ 'oppsett' og fÃ¸lg\nveiviseren til den forespÃ¸r:"
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Sensurerer, eller blokkerer pÃ¥ annen mÃ¥te, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?"
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -215,52 +231,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Velg 'Ja' og klikk sÃ¥ 'Neste'. For Ã¥ sette opp nye broer, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde vÃ¦re klar til kamp! Hvis du fÃ¥r problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "Vis denne meldingen."
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "ForespÃ¸rr broer med fabrikkoppsett."
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "EtterspÃ¸r IPv6-broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "EtterspÃ¸rr pluggbar transport etter TYPE."
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "FÃ¥ kopi av BridgeDBs offentlige GnuPG-nÃ¸kkel."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapporter en feil"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Kildekode"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Endringslogg"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontakt"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr "PÃ¥ tryne i myra!"
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "Det er for tiden ingen tilgjengelige broer..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -301,28 +326,27 @@ msgstr "NÃ¥ %s legg til broer til Tor-nettleser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sB%sare gi meg noen broer!"
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "Avanserte valg"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Nei"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "ingen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -330,7 +354,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sT%silknytt broer"
diff --git a/nds/LC_MESSAGES/bridgedb.po b/nds/LC_MESSAGES/bridgedb.po
index dc9f7b7..c6fae91 100644
--- a/nds/LC_MESSAGES/bridgedb.po
+++ b/nds/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/torproject/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ne/LC_MESSAGES/bridgedb.po b/ne/LC_MESSAGES/bridgedb.po
index ea4d49a..5695251 100644
--- a/ne/LC_MESSAGES/bridgedb.po
+++ b/ne/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/torproject/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po
index cecc09d..efff611 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -5,20 +5,20 @@
 # Translators:
 # Adriaan Callaerts <adriaan.callaerts@xxxxxxxxx>, 2013
 # Ann Boen <ann.boen@xxxxxxxxx>, 2014
-# erwindelaat <erwin.de.laat@xxxxxxxxxxxxxx>, 2014
-# WMRKameleon <info@xxxxxxxxxxxxxx>, 2013
+# Cleveridge <erwin.de.laat@xxxxxxxxxxxxxx>, 2014
+# Johann Behrens <info@xxxxxxxxxxxxxx>, 2013
 # Shondoit Walker <shondoit@xxxxxxxxx>, 2011
-# Marco Brohet <therbom@xxxxxxxxx>, 2012
-# guryman <tombecht@xxxxxxx>, 2014
+# Marco Brohet <inactive+therbom@xxxxxxxxxxxxx>, 2012
+# Tom Becht <tombecht@xxxxxxx>, 2014
 # math1985 <transifex@xxxxxxxxxxxxxxxxxxx>, 2013
 # BBLN <webmaster@xxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-02 15:22+0000\n"
-"Last-Translator: Ann Boen <ann.boen@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,19 +29,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Er is iets mis gegaan met je verzoek."
 
@@ -65,39 +62,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (combineer commando's om meerdere opties tegelijkertijd te specificeren)"
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "Welkom bij BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr "Huidig ondersteunde transport TYPEs:"
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hoi, %s!"
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr "Hallo, vriend!"
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Publieke Sleutels"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr "Deze email is gegenereerd met regenbogen, eenhoorns, en fonkelingen voor %s op %s om %s."
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,14 +109,20 @@ msgid ""
 "\n"
 msgstr "BridgeDB kan voorzien in bridges met meerdere Pluggable Transports%s %stypes,\ndie helpen bij het verduisteren van uw connecties naar het Tor netwerk,\nwaardoor het moeilijker wordt voor anderen om uw internet traffic te bekijken en vast te stellen dat u Tor gebruikt.\n\n"
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr "Sommige bridges met IPv6 adressen zijn eveneens beschikbaar, maar sommige Pluggable\nTransports bieden geen ondersteuning voor IPv6.\n"
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,96 +131,104 @@ msgid ""
 "\n"
 msgstr "Verder heeft BridgeDB genoeg oude vanilla bridges %s zonder enige\nPluggable Transports %s wat mogelijk niet zo cool klinkt, maar deze kunnen nog steeds helpen bij het omzeilen van internetcensuur in de meeste gevallen.\n\n"
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Wat zijn bridges?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s zijn Tor relays die je helpen censuur te omzeilen."
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Een andere manier om bridges te bemachtingen is door een email te sturen naar %s. \nHoudt er rekening mee dat u een email moet sturen door gebruik te maken van een adres van een de volgende providers:\n%s of %s."
+"%s, %s or %s."
+msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Als uw Tor niet werkt, email dan naar %s."
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Probeer zoveel mogelijk informatie toe te voegen over je situatie als je kan, waaronder de lijst met \nbridges en Pluggable Transports die je geprobeerd hebt te gebruiken, je Tor Browser versie,\nen alle meldingen welke Tor heeft uitgegeven, etc."
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr "Hier zijn je bridge regels:"
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr "Krijg Bridges!"
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "Selecteer opties voor bridge type:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "Heeft u IPv6 adressen nodig?"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Heeft u een %s nodig?"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "Uw browser vertoont afbeeldingen niet naar behoren."
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr "Voer de karakters in van de afbeelding hier beneden..."
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr "Hoe te starten met het gebruik van je bridges"
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr "Om bridges toe te voegen in Tor Browser, volg de instructies op de %s Tor\nBrowser download pagina %s om de Tor Browser te starten."
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Wanneer de 'Tor Network Settings' dialoog opent, klik 'Configure' en volg\nde wizard totdat deze vraagt om:"
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Blokkeert of censureert je internetprovider (ISP) verbindingen\nnaar het Tor netwerk?"
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -220,52 +236,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Selecteer 'Ja' en klik vervolgens 'Next'. Om je nieuwe bridges te configureren, kopieer en\nplak je de bridge regels in het invoerveld. Vervolgens klik je 'Connect', en\nben je klaar om te gaan! Als je problemen ervaart, klik dan de 'Help'\nknop in de 'Tor Network Settings' wizard voor verdere hulp."
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "Toont dit bericht."
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "Vraag vanilla bridges aan."
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "Verzoek IPv6 bridges"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Vraag een Pluggable Transport op TYPE aan."
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Verkrijg een kopie van BridgeDB's publieke GnuPG key."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapporteer een bug"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Broncode"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Wijzigingslogboek"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contact"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr "Helaas pindakaas!"
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "Er zijn momenteel geen bridges beschikbaar..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -306,28 +331,27 @@ msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "Geef me %sg%sewoon bridges!"
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "Geavanceerde Opties"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Nee"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "geen"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sJ%sa!"
@@ -335,7 +359,7 @@ msgstr "%sJ%sa!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sK%srijg Bridges"
diff --git a/nl_BE/LC_MESSAGES/bridgedb.po b/nl_BE/LC_MESSAGES/bridgedb.po
index 132589b..5684b9d 100644
--- a/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/nl_BE/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po
index d017663..0372dc2 100644
--- a/nn/LC_MESSAGES/bridgedb.po
+++ b/nn/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-08 19:01+0000\n"
-"Last-Translator: BjÃ¸rn I. <bjorn.svindseth@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
@@ -141,7 +141,7 @@ msgstr "Eg treng ein alternativ mÃ¥te Ã¥ fÃ¥ bruer pÃ¥!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -254,19 +254,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapporter feil"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Kjeldekode"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
diff --git a/nso/LC_MESSAGES/bridgedb.po b/nso/LC_MESSAGES/bridgedb.po
index 69eb442..46c93e3 100644
--- a/nso/LC_MESSAGES/bridgedb.po
+++ b/nso/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Northern Sotho (http://www.transifex.com/projects/p/torproject/language/nso/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/oc/LC_MESSAGES/bridgedb.po b/oc/LC_MESSAGES/bridgedb.po
index 4e941f6..093069d 100644
--- a/oc/LC_MESSAGES/bridgedb.po
+++ b/oc/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/torproject/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/or/LC_MESSAGES/bridgedb.po b/or/LC_MESSAGES/bridgedb.po
index 58a38bd..ebca43f 100644
--- a/or/LC_MESSAGES/bridgedb.po
+++ b/or/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/torproject/language/or/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po
index 9e5363b..1faad93 100644
--- a/pa/LC_MESSAGES/bridgedb.po
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-27 02:12+0000\n"
-"Last-Translator: A S Alam <apreet.alam@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/torproject/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "à¨ªà©?à¨² à¨?à©? à¨¹à¨¨?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "à¨¨à¨¹à©?à¨?"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/pap/LC_MESSAGES/bridgedb.po b/pap/LC_MESSAGES/bridgedb.po
index bc0064c..a9ea855 100644
--- a/pap/LC_MESSAGES/bridgedb.po
+++ b/pap/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Papiamento (http://www.transifex.com/projects/p/torproject/language/pap/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po
index ec21fcb..e578ead 100644
--- a/pl/LC_MESSAGES/bridgedb.po
+++ b/pl/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-25 10:05+0000\n"
-"Last-Translator: Aron <aron.plotnikowski@xxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +79,7 @@ msgstr "Witaj, %s!"
 msgid "Hello, friend!"
 msgstr "Witaj przyjacielu!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Klucze Publiczne"
 
@@ -147,8 +147,8 @@ msgstr "PotrzebujÄ? alternatywnego sposobu na pozyskanie mostkÃ³w!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Innym sposobem uzyskania bridges jest wysÅ?anie e-maila do %s. ProszÄ? pamiÄ?taj, Å¼e musisz \nwysÅ?aÄ? e-mail za uzywajÄ?c adresu z jednego z nastÄ?pujÄ?cych dostawcÃ³w usÅ?ugi email:\n%s lub %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -260,19 +260,19 @@ msgstr "PoproÅ? o Pluggable Transport przez TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Uzyskaj kopiÄ? klucza publicznego GnuPG BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "ZgÅ?oÅ? BÅ?Ä?d"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Kod ÅºrÃ³dÅ?owy"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Lista zmian"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontakt"
 
diff --git a/pms/LC_MESSAGES/bridgedb.po b/pms/LC_MESSAGES/bridgedb.po
index fd17309..3512980 100644
--- a/pms/LC_MESSAGES/bridgedb.po
+++ b/pms/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Piemontese (http://www.transifex.com/projects/p/torproject/language/pms/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ps/LC_MESSAGES/bridgedb.po b/ps/LC_MESSAGES/bridgedb.po
index 440ebaa..9ffdc96 100644
--- a/ps/LC_MESSAGES/bridgedb.po
+++ b/ps/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Pushto (http://www.transifex.com/projects/p/torproject/language/ps/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po
index 7d63c77..b7ef2e5 100644
--- a/pt/LC_MESSAGES/bridgedb.po
+++ b/pt/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-04 11:20+0000\n"
-"Last-Translator: SÃ©rgio Marques <smarquespt@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgstr "OlÃ¡, %s!"
 msgid "Hello, friend!"
 msgstr "OlÃ¡, amigo!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Chaves pÃºblicas"
 
@@ -146,8 +146,8 @@ msgstr "Preciso de uma alternativa para obter pontes!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Outro mÃ©todo para obter pontes Ã© escrever uma mensagem para %s. Tenha em atenÃ§Ã£o\nque tem de enviar a mensagem atravÃ©s de um dos seguintes fornecedores de correio:\n%s ou %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -259,19 +259,19 @@ msgstr "Solicita um Pluggable Transport por TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obter uma cÃ³pia da chave pÃºblica GnuPG da BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Reportar um erro"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "CÃ³digo fonte"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Registo de alteraÃ§Ãµes"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contactos"
 
diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 6548767..bb6e526 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-04 22:50+0000\n"
-"Last-Translator: Communia <ameaneantie@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgstr "OlÃ¡, %s!"
 msgid "Hello, friend!"
 msgstr "OlÃ¡, amigo!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Chaves PÃºblicas"
 
@@ -146,8 +146,8 @@ msgstr "Preciso de um outro modo de obter pontes!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Outro modo de obter pontes Ã© enviando um e-mail para %s. Por favor, lembre que vocÃª deve enviar o e-mail utilizando um endereÃ§o de um dos seguintes provedores de e-mail: \n%s ou %s. "
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -259,19 +259,19 @@ msgstr "Requerer Transporte PlugÃ¡vel por TYPE"
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Obter uma cÃ³pia da chave pÃºblica GnuPG do BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Relatar um Bug"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "CÃ³digo Fonte:"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Registro de alteraÃ§Ãµes"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contato"
 
diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po
index 5f181df..7237137 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # Adda.17 <adrianatrifoi@xxxxxxxxx>, 2013
-# isus <isus@xxxxxxxxxxxxxxx>, 2014
+# Isus Satanescu <isus@xxxxxxxxxxxxxxx>, 2014
 # laura berindei <lauraagavriloae@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-13 19:40+0000\n"
-"Last-Translator: isus <isus@xxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr "Buna , %s!"
 msgid "Hello, friend!"
 msgstr "Buna , prietene !"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Chei publice"
 
@@ -143,8 +143,8 @@ msgstr "Am nevoie de o cale alternativÄ? de a obÈ?ine punÈ?ile !"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Alt mod de a obÈ?ine punÈ?ie este sÄ? trimiteÈ?i un email la %s. RemarcaÈ?i cÄ? trebuie sÄ? trimiteÈ?i un email de la unul din urmÄ?torii privederi::\n%s or %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -256,19 +256,19 @@ msgstr "CereÈ?i un Pluggable Transport dupÄ? TYPE."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "ObÈ?ineÈ?i o copie a cheii GnuPG publice a BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "RaporaÈ?i un bug"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Cod sursÄ?"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "SchimbÄ?ri"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contact"
 
diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index 13b9ab0..af7f298 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-05 18:43+0000\n"
-"Last-Translator: Vitaliy Grishenko <vitolink@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +79,7 @@ msgstr "ÐÐ¹, %s!"
 msgid "Hello, friend!"
 msgstr "Ð?Ñ?Ð¸Ð²ÐµÑ?, Ð´Ñ?Ñ?Ð³!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð¸"
 
@@ -147,8 +147,8 @@ msgstr "Ð?Ð½Ðµ Ð½Ñ?Ð¶ÐµÐ½ Ð°Ð»Ñ?Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð½Ñ?Ð¹ Ñ?Ð¿Ð¾Ñ?Ð¾Ð± Ð¿Ð¾Ð»Ñ?Ñ?Ðµ
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ð¼ Ñ?Ð¿Ð¾Ñ?Ð¾Ð±Ð¾Ð¼ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¼Ð¾Ñ?Ñ?Ð¾Ð² Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ° Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð¸Ñ?Ñ?Ð¼Ð° Ð½Ð° Ð°Ð´Ñ?ÐµÑ? %s. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð¾Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ð° Ñ?Ð¾, Ñ?Ñ?Ð¾ Ð²Ñ? Ð´Ð¾Ð»Ð¶Ð½Ñ? \nÐ¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð· Ð¿ÐµÑ?ÐµÑ?Ð¸Ñ?Ð»ÐµÐ½Ð½Ñ?Ñ? Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð¾Ð²:\n%s Ð¸Ð»Ð¸ %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -260,19 +260,19 @@ msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ? Ð¿Ð¾ TYPE
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð¿Ð¸Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ð¾Ð³Ð¾ GnuPG ÐºÐ»Ñ?Ñ?Ð° BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ?Ð¸Ñ?Ñ? Ð¾Ð± Ð¾Ñ?Ð¸Ð±ÐºÐµ"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð´Ð½Ñ?Ð¹ ÐºÐ¾Ð´"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Ð?Ð¾Ð³ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
 
diff --git a/ru@petr1708/LC_MESSAGES/bridgedb.po b/ru@petr1708/LC_MESSAGES/bridgedb.po
index 9adb9c4..688160a 100644
--- a/ru@petr1708/LC_MESSAGES/bridgedb.po
+++ b/ru@petr1708/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-06 05:50+0000\n"
-"Last-Translator: slav\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ð?Ñ£Ñ?Ñ?"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/scn/LC_MESSAGES/bridgedb.po b/scn/LC_MESSAGES/bridgedb.po
index 346800f..618cfcd 100644
--- a/scn/LC_MESSAGES/bridgedb.po
+++ b/scn/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Sicilian (http://www.transifex.com/projects/p/torproject/language/scn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,7 +72,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -253,19 +253,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
diff --git a/sco/LC_MESSAGES/bridgedb.po b/sco/LC_MESSAGES/bridgedb.po
index c25e169..d0ca225 100644
--- a/sco/LC_MESSAGES/bridgedb.po
+++ b/sco/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Scots (http://www.transifex.com/projects/p/torproject/language/sco/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/si_LK/LC_MESSAGES/bridgedb.po b/si_LK/LC_MESSAGES/bridgedb.po
index 3510dd0..20ddc56 100644
--- a/si_LK/LC_MESSAGES/bridgedb.po
+++ b/si_LK/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# ganeshwaki <ganeshwaki@xxxxxxxxx>, 2013
+# Ganesh Wakista <ganeshwaki@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "à·?à·?à¶à·? à¶ºà¶±à·? à¶¸à·?à¶±à·?à·?à¶¯?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "à·?à·?à¶à·? à¶½à¶¶à·?à¶?à·?à¶±à·?à¶¸à¶§ à·?à·?à¶?à¶½à·?à¶´ à·?à·?à¶°à·?à¶ºà¶?à·? à¶¸à¶§ à¶?à·?à·?à·?â??à¶ºà¶º!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "à¶¸à·?à¶?à·? à·?à·?à¶à·? à·?à·?à¶© à¶±à·?à¶?à¶»à¶ºà·?! à¶¸à¶§ à¶?à¶¯à·?à·? à¶?à·?à·?à·?â??à¶ºà¶ºà·?!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "à¶±à·?à¶"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po
index f529e20..b66861c 100644
--- a/sk/LC_MESSAGES/bridgedb.po
+++ b/sk/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-04 05:30+0000\n"
-"Last-Translator: elo\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "VerejnÃ© kÄ¾ÃºÄ?e"
 
@@ -144,7 +144,7 @@ msgstr "Potrebujem inÃ½ spÃ´sob ako zÃskaÅ¥ premostenia!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -257,19 +257,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "NahlÃ¡siÅ¥ chybu"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "ZdrojovÃ½ kÃ³d"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontakt"
 
diff --git a/sk_SK/LC_MESSAGES/bridgedb.po b/sk_SK/LC_MESSAGES/bridgedb.po
index c8b5855..64f4db9 100644
--- a/sk_SK/LC_MESSAGES/bridgedb.po
+++ b/sk_SK/LC_MESSAGES/bridgedb.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# once <matejbacik@xxxxxxxxx>, 2014
+# once, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-23 21:20+0000\n"
-"Last-Translator: once <matejbacik@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "VerejnÃ© kÄ¾ÃºÄ?e"
 
@@ -141,7 +141,7 @@ msgstr "Potrebujem alternatÃvny spÃ´sob zÃskania bridges!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -254,19 +254,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
diff --git a/sl/LC_MESSAGES/bridgedb.po b/sl/LC_MESSAGES/bridgedb.po
index 8f4c480..118555b 100644
--- a/sl/LC_MESSAGES/bridgedb.po
+++ b/sl/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ne"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/sl_SI/LC_MESSAGES/bridgedb.po b/sl_SI/LC_MESSAGES/bridgedb.po
index f98d50c..457bc7f 100644
--- a/sl_SI/LC_MESSAGES/bridgedb.po
+++ b/sl_SI/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # marko <mr.marko@xxxxxxxxx>, 2011
-# Nwolfy, 2014
+# Nwolfy <nikopavlinek@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n"
 "MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -58,39 +55,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/sn/LC_MESSAGES/bridgedb.po b/sn/LC_MESSAGES/bridgedb.po
index ba893c0..627cdaa 100644
--- a/sn/LC_MESSAGES/bridgedb.po
+++ b/sn/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Shona (http://www.transifex.com/projects/p/torproject/language/sn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/so/LC_MESSAGES/bridgedb.po b/so/LC_MESSAGES/bridgedb.po
index 369a51e..5790eca 100644
--- a/so/LC_MESSAGES/bridgedb.po
+++ b/so/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/torproject/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/son/LC_MESSAGES/bridgedb.po b/son/LC_MESSAGES/bridgedb.po
index c802265..40f852c 100644
--- a/son/LC_MESSAGES/bridgedb.po
+++ b/son/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Songhay (http://www.transifex.com/projects/p/torproject/language/son/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/sq/LC_MESSAGES/bridgedb.po b/sq/LC_MESSAGES/bridgedb.po
index 1f8ddb2..8c8773a 100644
--- a/sq/LC_MESSAGES/bridgedb.po
+++ b/sq/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Jo"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index 78277cb..966fcda 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "NE"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/sr@latin/LC_MESSAGES/bridgedb.po b/sr@latin/LC_MESSAGES/bridgedb.po
index ff77f8a..b1f55b2 100644
--- a/sr@latin/LC_MESSAGES/bridgedb.po
+++ b/sr@latin/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/torproject/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ne"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/st/LC_MESSAGES/bridgedb.po b/st/LC_MESSAGES/bridgedb.po
index 896d62d..f68fb54 100644
--- a/st/LC_MESSAGES/bridgedb.po
+++ b/st/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Sotho, Southern (http://www.transifex.com/projects/p/torproject/language/st/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/su/LC_MESSAGES/bridgedb.po b/su/LC_MESSAGES/bridgedb.po
index 3143d19..7493178 100644
--- a/su/LC_MESSAGES/bridgedb.po
+++ b/su/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Sundanese (http://www.transifex.com/projects/p/torproject/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 62c7622..e2e3a0f 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-17 09:50+0000\n"
-"Last-Translator: phst <transifex@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +77,7 @@ msgstr "Hej, %s!"
 msgid "Hello, friend!"
 msgstr "Hej, kompis!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Publika nycklar"
 
@@ -145,8 +145,8 @@ msgstr "Jag behÃ¶ver ett alternativt sÃ¤tt att skaffa bryggor pÃ¥!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Ett annat sÃ¤tt att fÃ¥ nya bryggor Ã¤r att skicka e-post till %s. Du mÃ¥ste skicka mailet\nfrÃ¥n en adress hos nÃ¥gon av fÃ¶ljande epostleverantÃ¶rer:\n%s eller %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -258,19 +258,19 @@ msgstr "Leta efter en Pluggable Transport av en viss TYPE"
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "HÃ¤mta en kopia av BridgeDB:s publika GnuPG-nyckel."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Rapportera en bugg"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "KÃ¤llkod"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Ã?ndringslogg"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Kontakt"
 
diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po
index 7981435..1d81f4c 100644
--- a/sw/LC_MESSAGES/bridgedb.po
+++ b/sw/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Swahili (http://www.transifex.com/projects/p/torproject/language/sw/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/szl/LC_MESSAGES/bridgedb.po b/szl/LC_MESSAGES/bridgedb.po
index 635aa19..134cac6 100644
--- a/szl/LC_MESSAGES/bridgedb.po
+++ b/szl/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Silesian (http://www.transifex.com/projects/p/torproject/language/szl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ta/LC_MESSAGES/bridgedb.po b/ta/LC_MESSAGES/bridgedb.po
index 900c132..68d10c6 100644
--- a/ta/LC_MESSAGES/bridgedb.po
+++ b/ta/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "à®?à®²à¯?à®²à¯?"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/te/LC_MESSAGES/bridgedb.po b/te/LC_MESSAGES/bridgedb.po
index 591ca14..26543fc 100644
--- a/te/LC_MESSAGES/bridgedb.po
+++ b/te/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/torproject/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/te_IN/LC_MESSAGES/bridgedb.po b/te_IN/LC_MESSAGES/bridgedb.po
index 2bda39c..40471d5 100644
--- a/te_IN/LC_MESSAGES/bridgedb.po
+++ b/te_IN/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Telugu (India) (http://www.transifex.com/projects/p/torproject/language/te_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index c7fa1ab..3edc798 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/torproject/language/en/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Something went wrong with your request."
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "Welcome to BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr "Currently supported transport TYPEs:"
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hey, %s!"
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr "Hello, friend!"
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Public Keys"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s."
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n\n"
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n"
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n"
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "What are bridges?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s are Tor relays that help you circumvent censorship."
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "I need an alternative way of getting bridges!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s."
+"%s, %s or %s."
+msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "My bridges don't work! I need help!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "If your Tor doesn't work, you should email %s."
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr "Here are your bridge lines:"
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr "Get Bridges!"
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "Please select options for bridge type:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "Do you need IPv6 addresses?"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Do you need a %s?"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "Your browser is not displaying images properly."
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr "Enter the characters from the image above..."
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr "How to start using your bridges"
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr "To enter bridges into Tor Browser, follow the instructions on the %s Tor\nBrowser download page %s to start Tor Browser."
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:"
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "Displays this message."
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "Request vanilla bridges."
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "Request IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Request a Pluggable Transport by TYPE."
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Get a copy of BridgeDB's public GnuPG key."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Report a Bug"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Source Code"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Changelog"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Contact"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr "Uh oh, spaghettios!"
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "There currently aren't any bridges available..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr "Now %s add the bridges to Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sJ%sust give me bridges!"
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "Advanced Options"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "No"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "none"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sY%ses!"
@@ -327,7 +351,7 @@ msgstr "%sY%ses!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sG%set Bridges"
diff --git a/tg/LC_MESSAGES/bridgedb.po b/tg/LC_MESSAGES/bridgedb.po
index 30e326b..6b204a5 100644
--- a/tg/LC_MESSAGES/bridgedb.po
+++ b/tg/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Tajik (http://www.transifex.com/projects/p/torproject/language/tg/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po
index 1ccb89c..1a144c5 100644
--- a/th/LC_MESSAGES/bridgedb.po
+++ b/th/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-23 08:02+0000\n"
-"Last-Translator: exploiz <exploiz@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr "à¸?à¸±à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸²à¸?à¹?à¸¥à¸·à¸à¸?à¸à¸·à¹?à¸?à¹?à¸?
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
 #: lib/bridgedb/strings.py:90
@@ -255,19 +255,19 @@ msgstr ""
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "à¹?à¸?à¹?à¸?à¸?à¸±à¹?à¸?"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
diff --git a/ti/LC_MESSAGES/bridgedb.po b/ti/LC_MESSAGES/bridgedb.po
index ab1ff44..abb8b0e 100644
--- a/ti/LC_MESSAGES/bridgedb.po
+++ b/ti/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Tigrinya (http://www.transifex.com/projects/p/torproject/language/ti/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/tk/LC_MESSAGES/bridgedb.po b/tk/LC_MESSAGES/bridgedb.po
index b39bfee..7a56945 100644
--- a/tk/LC_MESSAGES/bridgedb.po
+++ b/tk/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Turkmen (http://www.transifex.com/projects/p/torproject/language/tk/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 0605021..9b7d2fa 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-15 06:30+0000\n"
-"Last-Translator: zeki <zeki.ozguryazilim@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +81,7 @@ msgstr "Selam, %s!"
 msgid "Hello, friend!"
 msgstr "Merhaba dostum!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "AÃ§Ä±k Anahtarlar"
 
@@ -149,8 +149,8 @@ msgstr "Bridges edinmek iÃ§in baÅ?ka bir yola ihtiyacÄ±m var!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "KÃ¶prÃ¼leri almanÄ±n diÄ?er bir yolu da %s adresine bir e-posta gÃ¶ndermektir.\nLÃ¼tfen e-postanÄ±n aÅ?aÄ?Ä±daki e-posta saÄ?layÄ±cÄ±lardan birinden alÄ±nmÄ±Å? bir\nadresten gÃ¶nderilmesi gerektiÄ?ini unutmayÄ±n:\n%s veya %s."
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -262,19 +262,19 @@ msgstr "TYPE tarafÄ±ndan Eklenebilir bir AktarÄ±m talep et."
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "BridgeDB'nin ortak bir GnuPG anahtar kopyasÄ±nÄ± al."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Bir Hata Bildir"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Kaynak Kodu"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "DeÄ?iÅ?im gÃ¼nlÃ¼Ä?Ã¼"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Ä°letiÅ?im"
 
diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index 502fa97..b913d44 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# ghostishev, 2014
+# Eugene ghostishev, 2014
 # LinuxChata, 2014
-# AVATOR <sclub2018@xxxxxxxxx>, 2013
+# Oleksii Golub <sclub2018@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 18:12+0000\n"
-"Last-Translator: LinuxChata\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,19 +23,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð?Ð¸ Ð¿Ñ?Ð¸Ð½Ð¾Ñ?Ð¸Ð¼Ð¾ Ð½Ð°Ñ?Ñ? Ð²Ð¸Ð±Ð°Ñ?ÐµÐ½Ð½Ñ?! Ð©Ð¾Ñ?Ñ? Ð¿Ñ?Ñ?Ð»Ð¾ Ð½Ðµ Ñ?Ð°Ðº Ð· Ð?Ð°Ñ?Ð¸Ð¼ Ð·Ð°Ð¿Ð¸Ñ?Ð¾Ð¼."
 
@@ -59,39 +56,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð¸: (ÐºÐ¾Ð¼Ð±Ñ?Ð½Ñ?Ð²Ð°Ñ?Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð²ÐºÐ°Ð·Ð°Ð²Ñ?Ð¸ ÐºÑ?Ð»Ñ?ÐºÐ° Ð²Ð°Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð² Ð¾Ð´Ð½Ð¾Ñ?Ð°Ñ?Ð½Ð¾)"
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr "Ð?Ð°Ñ?ÐºÐ°Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ð¼Ð¾ Ñ? BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr "Ð£ Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? transport TYPE:"
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, %s!"
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr "Ð?Ñ?Ð¸Ð²Ñ?Ñ?, Ð´Ñ?Ñ?Ð¶Ðµ!"
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "Ð?Ñ?Ð´ÐºÑ?Ð¸Ñ?Ñ? ÐºÐ»Ñ?Ñ?Ñ?"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr "Ð¦ÐµÐ¹ Ð»Ð¸Ñ?Ñ? Ð±Ñ?Ð² Ð·Ð³ÐµÐ½ÐµÑ?Ð¾Ð²Ð°Ð½Ð¾ Ð· Ñ?Ð°Ð¹Ð´Ñ?Ð³Ð°Ð¼Ð¸, Ñ?Ð´Ð¸Ð½Ð¾Ñ?Ð¾Ð³Ð°Ð¼Ð¸ Ñ? Ð±Ð»Ð¸Ñ?ÐºÑ?Ñ?ÐºÐ°Ð¼Ð¸\nÐ´Ð»Ñ? %s %s Ð¾ %s."
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,14 +103,20 @@ msgid ""
 "\n"
 msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ?Ð¸Ñ?Ð¸ bridges Ð· Ð´ÐµÐºÑ?Ð»Ñ?ÐºÐ¾Ð¼Ð° %sÑ?Ð¸Ð¿Ð°Ð¼Ð¸ Pluggable Transports%s,\nÑ?ÐºÑ? Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð²Ð¾Ñ? Ð·Ð²'Ñ?Ð·ÐºÐ¸ Ð· Tor Ð¼ÐµÑ?ÐµÐ¶ÐµÑ?, Ñ?Ð¾ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð½Ñ?Ñ? Ñ?Ð¾Ð±Ð¾Ñ?Ñ?\nÐ´Ð»Ñ? Ñ?Ð¸Ñ?, Ñ?Ñ?Ð¾ Ð¿ÐµÑ?ÐµÐ²Ñ?Ñ?Ñ?Ñ? Ð?Ð°Ñ? Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ñ?Ð°Ñ?Ñ?Ðº, Ñ?Ð¾Ð± Ð²Ð¸Ð·Ð½Ð°Ñ?Ð¸Ñ?Ð¸, Ñ?Ð¾ Ð?Ð¸\nÐ²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ðµ Tor. \n"
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr "Ð?ÐµÑ?ÐºÑ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð· Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð¸ IPv6, Ñ?Ð°ÐºÐ¾Ð¶ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?, Ñ?Ð¾Ñ?Ð° Ð´ÐµÑ?ÐºÑ? Pluggable\nTransports Ð½Ðµ Ñ?Ñ?Ð¼Ñ?Ñ?Ð½Ñ? Ð· IPv6.\n"
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -117,96 +125,104 @@ msgid ""
 "\n"
 msgstr "Ð?Ñ?Ñ?Ð¼ Ñ?Ð¾Ð³Ð¾, BridgeDB Ð¼Ð°Ñ? Ð±Ð°Ð³Ð°Ñ?Ð¾ plain-ol'-vanilla bridges %s Ð±ÐµÐ·\nPluggable Transports %s, Ñ?ÐºÑ?, Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð½Ðµ Ð·Ð²Ñ?Ñ?Ð°Ñ?Ñ? Ð³Ð°Ñ?Ð½Ð¾, Ð°Ð»Ðµ Ð²Ð¾Ð½Ð¸ \nÐ¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¾Ð±Ñ?Ð¹Ñ?Ð¸ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ? Ð² Ð±Ð°Ð³Ð°Ñ?Ñ?Ð¾Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÐ°Ñ?.\n"
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "Ð©Ð¾ Ñ?Ð°ÐºÐµ Ñ?ÐµÑ?Ñ?Ð°Ð½Ñ?Ð»Ñ?Ñ?Ð¾Ñ? Ñ?Ð¸Ð¿Ñ? Ð¼Ñ?Ñ?Ñ??"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Bridges %s Ñ? Tor Ñ?ÐµÐ»Ðµ, Ñ?ÐºÑ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ñ?Ñ?Ñ? Ð?Ð°Ð¼ Ð¾Ð±Ñ?Ð¹Ñ?Ð¸ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?."
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "Ð?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ Ð°Ð»Ñ?Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð½Ð¸Ð¹ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÑ? Ð¼Ð¾Ñ?Ñ?Ñ?Ð²!"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Ð©Ðµ Ð¾Ð´Ð¸Ð½ Ñ?Ð¿Ð¾Ñ?Ñ?Ð± Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ bridges - Ñ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð»Ð¸Ñ?Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? %s. Ð?Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ñ?Ð²Ð°Ð³Ñ?, Ñ?Ð¾\nÐ?Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ? Ð½Ð°Ð´Ñ?Ñ?Ð»Ð°Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?, Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð´ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð· Ð½Ð°Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð¸ÐºÑ?Ð²\nÐ¿Ð¾Ñ?Ð»Ñ?Ð³ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸:\n%s Ð°Ð±Ð¾ %s."
+"%s, %s or %s."
+msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr "Ð?Ð¾Ñ? Ð¼Ð¾Ñ?Ñ?Ð¸ Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ñ?! Ð?Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ñ?Ñ?Ñ?!"
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Ð¯ÐºÑ?Ð¾ Ð?Ð°Ñ? Tor Ð½Ðµ Ð¿Ñ?Ð°Ñ?Ñ?Ñ?, Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð²Ñ?Ð´Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð°Ð¼ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð»Ð¸Ñ?Ñ?Ð° %s."
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr "Ð¡Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐºÐ½Ð°Ð¹Ð±Ñ?Ð»Ñ?Ñ?Ðµ Ñ?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾ Ð?Ð°Ñ? Ð²Ð¸Ð¿Ð°Ð´Ð¾Ðº, Ð² Ñ?Ð¾Ð¼Ñ? Ñ?Ð¸Ñ?Ð»Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº\nbridges Ñ? Pluggable Transports, Ñ?Ð¾ Ð?Ð¸ Ð½Ð°Ð¼Ð°Ð³Ð°Ð»Ð¸Ñ?Ñ? Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸, Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor,\nÑ? Ð±Ñ?Ð´Ñ?-Ñ?ÐºÑ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?, Ñ?ÐºÑ? Tor Ð²Ð¸Ð´Ð°Ð²Ð°Ð², Ñ? Ñ?.Ð´."
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr "Ð?Ñ?Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð?Ð°Ñ?Ð¾Ð³Ð¾ bridge:"
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Bridges!"
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr "Ð?Ñ?Ð´Ñ? Ð»Ð°Ñ?ÐºÐ°, Ð¾Ð±ÐµÑ?Ñ?Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Ñ?Ð¸Ð¿Ñ? bridge:"
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ IPv6?"
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð?Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?Ñ?Ð±ÐµÐ½ %s?"
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr "Ð?Ð°Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ð½Ðµ Ð²Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ?Ð¸Ð½Ð¾Ð¼."
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr "Ð?Ð²ÐµÐ´Ñ?Ñ?Ñ? Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ñ?Ð¸Ð¼Ð²Ð¾Ð»Ð¸ ..."
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr "Ð¯Ðº Ð¿Ð¾Ñ?Ð°Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ñ? Ð?Ð°Ñ?Ð¸Ð¼Ð¸ bridges"
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr "Ð?Ð»Ñ? Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ? bridges Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ñ? Tor, Ð´Ð¾Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹Ñ?ÐµÑ?Ñ? Ñ?Ð½Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ð¹ %s Ð½Ð° Ñ?Ñ?Ð¾Ñ?Ñ?Ð½Ñ?Ñ? \nÐ·Ð°Ð²Ð°Ð½Ñ?Ð°Ð¶ÐµÐ½Ð½Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor %s Ð´Ð»Ñ? Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° Tor."
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "Ð?Ð¾Ð»Ð¸ Ð´Ñ?Ð°Ð»Ð¾Ð³ \"Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor\" Ð²Ñ?Ð´ÐºÑ?Ð¸Ñ?Ñ?Ñ?Ñ?Ñ?, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸\" Ñ? Ð´Ð¾Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹Ñ?ÐµÑ?Ñ?\nÐ¿Ñ?Ð´ÐºÐ°Ð·ÐºÐ°Ð¼ Ð¼Ð°Ð¹Ñ?Ñ?Ñ?Ð°, Ð´Ð¾Ð¿Ð¾ÐºÐ¸ Ð²Ñ?Ð½ Ð½Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ñ?:"
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¹ Ñ?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ð¿Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? (ISP) Ð±Ð»Ð¾ÐºÑ?Ñ? Ð°Ð±Ð¾ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?\nÐ´Ð¾ Ð¼ÐµÑ?ÐµÐ¶Ñ? Tor?"
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -214,52 +230,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Ð?Ð¸Ð±ÐµÑ?Ñ?Ñ?Ñ? \"Ð¢Ð°Ðº\", Ð° Ð¿Ð¾Ñ?Ñ?Ð¼ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? \"Ð?Ð°Ð»Ñ?\". Ð?Ð»Ñ? Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð½Ð¾Ð²Ð¸Ñ? bridges, Ñ?ÐºÐ¾Ð¿Ñ?Ñ?Ð¹Ñ?Ðµ Ñ?\nÐ²Ñ?Ñ?Ð°Ð²Ñ?Ðµ Ð»Ñ?Ð½Ñ?Ñ? bridge Ñ? Ð¿Ð¾Ð»Ðµ Ð´Ð»Ñ? Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ?. Ð?Ð¾Ñ?Ñ?Ð¼, Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ñ? 'Ð?Ñ?Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ?', Ñ?\nÐ²Ñ?Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸! Ð¯ÐºÑ?Ð¾ Ñ? Ð?Ð°Ñ? Ð²Ð¸Ð½Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸, Ñ?Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ð¸ \"Ð?Ð¾Ð²Ñ?Ð´ÐºÐ°\" \nÐ² Ð¼Ð°Ð¹Ñ?Ñ?Ñ?Ð¾Ð²Ñ? \"Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Tor' Ð´Ð»Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð´Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ð¾Ñ? Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸."
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr "Ð?Ñ?Ð´Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ? Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?."
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? vanilla bridges."
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? IPv6 bridges."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Ð?Ð°Ð¿Ð¸Ñ? Ð½Ð° Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Pluggable Transport Ð¿Ð¾ TYPE."
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ ÐºÐ¾Ð¿Ñ?Ñ? Ð²Ñ?Ð´ÐºÑ?Ð¸Ñ?Ð¾Ð³Ð¾ GnuPG ÐºÐ»Ñ?Ñ?Ð° Ð´Ð»Ñ? BridgeDB."
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "Ð?Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ?"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "Ð?Ð¾Ð´"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð·Ð¼Ñ?Ð½"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr "Ð?Ð¹-Ð¾Ð¹, spaghettios!"
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr "Ð? Ð´Ð°Ð½Ð¸Ð¹ Ñ?Ð°Ñ? Ð½ÐµÐ¼Ð°Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? bridges ..."
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -300,28 +325,27 @@ msgstr "Ð¢ÐµÐ¿ÐµÑ? %s Ð´Ð¾Ð´Ð°Ð¹ bridges Ð´Ð¾ Tor Browser %s"
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr "%sÐ¢%sÑ?Ð»Ñ?ÐºÐ¸ Ð´Ð°Ð¹ Ð¼ÐµÐ½Ñ? bridges!"
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr "Ð Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ½Ñ? Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸"
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ð?Ñ?"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr "Ð¶Ð¾Ð´ÐµÐ½"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sÐ¢%sÐ°Ðº!"
@@ -329,7 +353,7 @@ msgstr "%sÐ¢%sÐ°Ðº!"
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr "%sÐ?%sÑ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Bridges"
diff --git a/ur/LC_MESSAGES/bridgedb.po b/ur/LC_MESSAGES/bridgedb.po
index edebefa..40ac002 100644
--- a/ur/LC_MESSAGES/bridgedb.po
+++ b/ur/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ur_PK/LC_MESSAGES/bridgedb.po b/ur_PK/LC_MESSAGES/bridgedb.po
index acc7142..e84f15b 100644
--- a/ur_PK/LC_MESSAGES/bridgedb.po
+++ b/ur_PK/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/torproject/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Ù?Û?Û?Úº"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/uz/LC_MESSAGES/bridgedb.po b/uz/LC_MESSAGES/bridgedb.po
index 9c9e120..771708c 100644
--- a/uz/LC_MESSAGES/bridgedb.po
+++ b/uz/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Umidjon Almasov <u.almasov@xxxxxxxxx>, 2013
+# Umid Almasov <u.almasov@xxxxxxxxx>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/torproject/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "Yo'q"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/ve/LC_MESSAGES/bridgedb.po b/ve/LC_MESSAGES/bridgedb.po
index aaf5b36..7131787 100644
--- a/ve/LC_MESSAGES/bridgedb.po
+++ b/ve/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Venda (http://www.transifex.com/projects/p/torproject/language/ve/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index 60e3a4e..4270ab2 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "KhÃ´ng"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/wa/LC_MESSAGES/bridgedb.po b/wa/LC_MESSAGES/bridgedb.po
index 93f7c96..961a708 100644
--- a/wa/LC_MESSAGES/bridgedb.po
+++ b/wa/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Walloon (http://www.transifex.com/projects/p/torproject/language/wa/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/wo/LC_MESSAGES/bridgedb.po b/wo/LC_MESSAGES/bridgedb.po
index 5ff3dc0..b30d651 100644
--- a/wo/LC_MESSAGES/bridgedb.po
+++ b/wo/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Wolof (http://www.transifex.com/projects/p/torproject/language/wo/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index aa17299..9371bb0 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-20 12:20+0000\n"
-"Last-Translator: Wu Ming Shi\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +80,7 @@ msgstr "å?¿ï¼?%sï¼?"
 msgid "Hello, friend!"
 msgstr "ä½ å¥½ï¼?æ??å??ï¼?"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "å?¬å?±å¯?å??"
 
@@ -148,8 +148,8 @@ msgstr "é??è¦?ä½¿ç?¨å?¶ä»?è?·å??æ?¹å¼?è?·å??ç½?æ¡¥ï¼?"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "è?·å¾? bridgesï¼?ç½?æ¡¥ï¼?ç??å?¦ä¸?ç§?æ?¹æ³?æ?¯å?? %s å??é??ä¸?å°?é?®ä»¶ã??æ³¨æ??ï¼?æ?¨å?ªè?½ä½¿ç?¨ä»¥ä¸?é?®ä»¶æ??å?¡å??æ??ä¾?ç??é?®ä»¶å?°å??å??é??ï¼?%s æ?? %s ã??"
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -261,19 +261,19 @@ msgstr "æ ¹æ?®TYPE è¯·æ±?Pluggable Transportã??"
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "è?·å??BridgeDBç??å?¬å?±GnuPGå¯?å??ã??"
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "æ?¥å??ç¼ºé?·"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "æº?ä»£ç ?"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "æ?´æ?¹æ?¥å¿?"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "è??ç³»æ?¹å¼?"
 
diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po
index 78441d1..054c4ea 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -57,39 +54,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr "ä»?éº¼æ?¯æ©?ï¼?"
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr "æ??é??è¦?å¾?å?°å?¦ä¸?ç¨®æ?¹å¼?ä¾?å¾?å?°æ©?ï¼?"
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr "å?¦"
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""
diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index af5a4bb..500b852 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-05 18:43+0000\n"
-"Last-Translator: danfong <danfong.hsieh@xxxxxxxxx>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr "å?¿ï¼?%s!"
 msgid "Hello, friend!"
 msgstr "æ??å??ï¼?æ?¨å¥½!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr "å?¬é??é??é?°"
 
@@ -141,8 +141,8 @@ msgstr "æ??é??è¦?ä½¿ç?¨å?¶ä»?æ?¹å¼?å??å¾?æ©?æ?¥!"
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "å??å¾?æ©?æ?¥ç??å?¦ä¸?ç¨®æ?¹å¼?æ?¯ç?¼é??é?»å?é?µä»¶è?³ %sã??è«?æ³¨æ??ï¼?æ?¨å¿?é ? \nä½¿ç?¨ä¾?è?ªä¸?å??é?»å?é?µä»¶æ??ä¾?è??ä¹?ä¸?ç??ä½?å??ç?¼é??é?»å?é?µä»¶: \n%s æ?? %sã??"
+"%s, %s or %s."
+msgstr ""
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
@@ -254,19 +254,19 @@ msgstr "æ??ç?§ TYPE è«?æ±? Pluggable Transportã??"
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "å??å¾? BridgeDB ç??å?¬å?± GnuPG é??é?°å?¯æ?¬ã??"
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr "å??å ±é?¯èª¤"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr "å??å§?ç¨?å¼?ç¢¼"
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr "è®?æ?´è¨?é??"
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr "é?£çµ¡è³?è¨?"
 
diff --git a/zu/LC_MESSAGES/bridgedb.po b/zu/LC_MESSAGES/bridgedb.po
index 1bde4d3..402f3fd 100644
--- a/zu/LC_MESSAGES/bridgedb.po
+++ b/zu/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: Zulu (http://www.transifex.com/projects/p/torproject/language/zu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
 #. "BridgeDB"
 #. "pluggable transport"
 #. "pluggable transports"
 #. "obfs2"
 #. "obfs3"
 #. "scramblesuit"
-#. "fte"
+#. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
@@ -56,39 +53,44 @@ msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr ""
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid "Currently supported transport TYPEs:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid "Public Keys"
 msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr ""
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid "I need an alternative way of getting bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr ""
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
 msgid ""
 "Try including as much info about your case as you can, including the list of\n"
 "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
 "and any messages which Tor gave out, etc."
 msgstr ""
 
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
 msgstr ""
 
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
 msgstr ""
 
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
 msgstr ""
 
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr ""
 
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr ""
 
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
 msgid "Displays this message."
 msgstr ""
 
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid "Source Code"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid "Changelog"
 msgstr ""
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid "Contact"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
 msgid "Uh oh, spaghettios!"
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
 msgid "No"
 msgstr ""
 
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid "%sG%set Bridges"
 msgstr ""

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

Prev by Author: [tor-commits] [translation/tor-and-https] Update translations for tor-and-https
Next by Author: [tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
Previous by thread: [tor-commits] [translation/bridgedb] Update translations for bridgedb
Next by thread: [tor-commits] [translation/bridgedb] Update translations for bridgedb
Index(es):
- Author
- Thread